Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1p-newdesign
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:58:24 +0000 (02:58 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:58:24 +0000 (02:58 +0000)

Trivial merge