updated readme
fixed merge conflict in readme
Merge branch 'master' of heroku.com:angrykittyproduction