merged Gal
Fixing app on heroku
Fixing app on heroku
fixing app in heroku
Fixing app on heroku
try
Merge branch 'master' into Gal