Trying again
Maybe another push will fix the app
trying again
Merge branch 'master' of git@heroku.com:changeurl.git

Conflicts:
	README.md
changed pocfile to allow to compile and run properly