colors
Merge branch 'master' of github.com:S-Chan/Wildhacks

Conflicts:
	blood_alcohol_crowdsourced/server/fixtures.js