something
Merge branch 'master' of https://github.com/grayape/scorekeeper
test changed to make nosetest work
merge