Initial commit of an example of heroku app
Fixin conflicts between github repo and local repo