Merge branch 'master' of github.com:sethwoodworth/FinalsClub
authorSeth Woodworth <seth@sethish.com>
Wed, 4 Jan 2012 04:59:41 +0000 (23:59 -0500)
committerSeth Woodworth <seth@sethish.com>
Wed, 4 Jan 2012 04:59:41 +0000 (23:59 -0500)

Trivial merge