all gui tests now fixed
fix conflict
Merge branch 'master' of github.com:BeatMyGoal/beatmygoal
all gui tests pass except creategoal