Add color dictionary for resources
Merge crisis.js
Merge branch 'master' of https://github.com/jrae/mongo-play
Merge hell
Merge branch 'master' of https://github.com/jrae/mongo-play

Conflicts:
	html/crisis.js