did a bunch of stuff
pushing git changes to heroku
merging with simon
removed unnecessary files
Merge branch 'master' of https://github.com/jzkung/assassins