ch-ch-ch-changes!
Merge remote-tracking branch 'origin/enemies'

Conflicts:
	javascript/object.js
	javascript/project/config.js
	javascript/project/elements.js
	javascript/project/resources.js
	javascript/public/gamejs.min.js
	javascript/scenes.js
fixes merge mistakes