update home page
Merge commit '865dc326c5cbf85d29e3c560e1dacb98fbe003b3'

Conflicts:
	app.js
	package.json
	routes/index.js