preliminary makefile for tests
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal
image upload fix