Pushing to class repo

cs160-berkeley · Nov 10, 2016 · 8ea5416 · 8ea5416
2 parents 7b113df + 0643a4b
commit 8ea5416
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,6 @@
+<<<<<<< HEAD
 # cs160
+=======
+# Group-22-Project
+Group 22 Project
+>>>>>>> 0643a4be607a2cb4f628156526cf32980c7afead