removed some remaining artifacts from a merge conflict  (wtf git?)
Merge branch 'master' of github.com:nikithase/working-title
Merge branch 'master' of github.com:nikithase/working-title