updates

updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/static/css/source/app.css
	app/views/home/index.ejs