fix welcome page
Merge branch 'heroku'