Updates for heroku deployment
Add readme, resolve conflict in gitignore