Development

Merge development to master with env set up for heroku deployment