Z-sorting
Removed displacement image
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
A lot of enemies due to waves have invaded this commit.
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/main.js
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29