WTF.git

leopic-Latitude-E6520:app (develop)➔ git pull 
Already up-to-date.
leopic-Latitude-E6520:app (develop)➔ git push
Counting objects: 85, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (51/51), done.
Writing objects: 100% (53/53), 39.40 KiB, done.
Total 53 (delta 26), reused 4 (delta 0)
Pushed to non-master branch, skipping build.
To git@heroku.com:husker.git
   9908fed..99e6405  develop -> develop
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@heroku.com:husker.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
leopic-Latitude-E6520:app (develop)➔