Fixed app so that we can deploy to Heroku