Merge branch 'master' of github.com:finalsclubdev/FinalsClub
authorJoseph Snow <josephsnow@gmail.com>
Sun, 20 Nov 2011 04:51:24 +0000 (21:51 -0700)
committerJoseph Snow <josephsnow@gmail.com>
Sun, 20 Nov 2011 04:51:24 +0000 (21:51 -0700)

Trivial merge