Checkins for Issue #9 #10
Merge branch 'master' of https://github.com/bbytes/MAMA

Conflicts:
	app.js
	config/routes.js
	package.json
Implementation of Issue #9 and #10. Need to get credentials