db update first part
Merge branch 'master' of https://github.com/wuwi/cahoots

Conflicts:
	db.json