Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sat, 19 Nov 2011 22:23:44 +0000 (22:23 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sat, 19 Nov 2011 22:23:44 +0000 (22:23 +0000)
1  2 
public/index.html

Simple merge