dev
dev
Merge branch 'master' of github.com:chrisjamhol/gamemaster

Conflicts:
	app.js
	db/mongo.js
dev