removing decorator and add heroku gems
merging