Ready for Heroku
Merge branch 'dev'