just grabbing pulls yo
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/MainScene.js
	Cocaine/src/resource.js