commit before branch, this code doesn't work.
fix stuff
fix merge
Merge branch 'master' into workingcursor
Merge branch 'master' of https://github.com/Cmput291Fa14TeamNYC/Project2
Merge branch 'workingcursor'

, and an empty message aborts