no message
Merge branch 'master' of https://github.com/travisbloom/expresssampleapp

Conflicts:
	app.js
controller changes, linking up to APIs
Fixing merge conflicts