Preparing for deployment to heroku
Merge branch 'development'