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
Changed test database name to fix travis syntax error
Merge pull request #20 from apesic/master

Changed test database name to fix travis syntax error
Bug fixing travis.yml file
Merge pull request #21 from apesic/master

Bug fixing travis.yml file