Merge branch 'master' of github.com:robsbeat1/Assignment1

robsbeat1 · Oct 24, 2012 · 864ae43 · 864ae43
2 parents c9540ab + 310ef9f
commit 864ae43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+Assignment1
+===========