beofre new material merge
Merge branch 'master' into asset-troubleshoot
add rails_12factor to gemfile, assist asset management
Merge pull request #19 from avifoxi/asset-troubleshoot

Asset pipelin heroku troubleshoot