Just call me Mr. Fixxit.
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/Dersh.js