code cleanup; testing cleanup
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal
cleanup