Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Mon, 14 Nov 2011 19:47:07 +0000 (19:47 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Mon, 14 Nov 2011 19:47:07 +0000 (19:47 +0000)

Trivial merge