added welcome
fix welcome page
Merge branch 'heroku'

Conflicts:
	app.js