base
Merge branch 'master' of https://github.com/AnthemiusGuo/shiitake

Conflicts:
	app.js
	package.json