Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:18:02 +0000 (02:18 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:18:02 +0000 (02:18 +0000)
1  2 
public/index.html

Simple merge