Merge branch 'devel' of github.com:sethwoodworth/FinalsClub into devel
authorjordan <jordancooperman@gmail.com>
Sun, 8 Jan 2012 20:56:38 +0000 (15:56 -0500)
committerjordan <jordancooperman@gmail.com>
Sun, 8 Jan 2012 20:56:38 +0000 (15:56 -0500)

Trivial merge