current version with cocos, but now needs to be redone...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/myApp.js