enemies defined in level file
Merge branch 'master' of https://github.com/jbakse/shump

* 'master' of https://github.com/jbakse/shump:
  promises, promises
  organized asset folder

Conflicts:
	assets/level_1.json
	scripts/app.js