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

Simple merge