wat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app.js
	controllers/router.js
	package.json