working copy paste code
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	server/constants.js