Merge branch 'master' of github.com:andrewdanks/Antz-from-da-Hood

Conflicts: GROUP_MEMBERS Added name onto GROUP_MEMBERS
andrewdanks · Nov 13, 2011 · f82f853 · f82f853
2 parents 51aa27c + bed9c25
commit f82f853
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/GROUP_MEMBERS b/GROUP_MEMBERS
@@ -1,2 +1,5 @@
 Andrew Danks
 Gabriel Luong
+Ellis Roberts
+Shunan Zhao
+