labelling
Merge branch 'master' of https://github.com/jrae/mongo-play

Conflicts:
	html/crisis.js