initial commit
Updates for heroku deployment
merge with github