Updated with new app generated using yo express-simple
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	app.js