testing framework up to speed
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal