add coco
Merge branch 'master' of https://github.com/walkingtospace/codecombat

Conflicts:
	app/views/admin_view.coffee