Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
authorfcdev@sleepless.com <ec2-user@ip-10-168-42-13.us-west-1.compute.internal>
Sun, 13 Nov 2011 00:33:27 +0000 (00:33 +0000)
committerfcdev@sleepless.com <ec2-user@ip-10-168-42-13.us-west-1.compute.internal>
Sun, 13 Nov 2011 00:33:27 +0000 (00:33 +0000)

Trivial merge