Merging with  upstream
Merge branch 'master' of https://github.com/cicadas-2014/BJR
Score page always returns an integer between 1 and 4
Merge pull request #32 from kz363/kevin/roundmodel

Kevin/roundmodel