readying for heroku deployment
manual merge