add heroku gems
merging
refactoring assets organization