Prepared for Heroku
Merge branch 'master' of github.com:deuxio/airbnc