Merge branch 'master' into issue8_fderby

codeforprinceton · Jul 18, 2017 · 15a9be8 · 15a9be8
2 parents 9dbbe4a + 0584584
commit 15a9be8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
-# team
+
+
+- # team
 Code For Princeton Members sample repo for Idea2App classes
 
 
-Hello World!
+Hello World! Nevermind.
 
 Members:
   - Shaun Ellis ([email protected])
@@ -11,3 +13,7 @@ Members:
   - Erika Serrano ([email protected])
   - Hanson Yu ([email protected])
   -Frank Derby ([email protected])
+  - Alison ([email protected])
+  - Sean O'Neill ([email protected])
+  - Mark Badros ([email protected])
+  - Fred Mitchell ([email protected])
diff --git a/index.html b/index.html
@@ -7,5 +7,6 @@
   <body>
   <h1>My Name</h1>
   <p>About me...</p>
+  <p>Nevermind.</p>
   </body>
 </html>