minor tweaks
heroku bug fixed
heroku bug fixed for images
Merge branch 'Inhak'