Merge branch 'test' into rett

oakesrandall · Aug 24, 2017 · a85de7d · a85de7d
2 parents 6911e85 + f362610
commit a85de7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -3,3 +3,7 @@ This is the readme for our project 3 app.  This app will show users random photo
 This is test
 
 Rett
+Alex LI
+David Randall ╭∩╮（︶︿︶）╭∩╮
+
+
diff --git a/src/db/seed.js b/src/db/seed.js
-Original file line number
+Diff line change
@@ Expand Up @@
     This is test
     Rett
+    Alex LI
+    David Randall ╭∩╮（︶︿︶）╭∩╮