adding rottenpotatoes and heroku
fixing merge