Merge branch 'devel' of github.com:sethwoodworth/FinalsClub into devel