Merge branch 'master' of github.com:suderman/homemaker

Conflicts:
	app.js
	package.json