Finish demo app
Finish demo app
Heroku fix