fixed cancel button and non-user post
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal
Merge branch 'master' of heroku.com:beatmygoal