Improvements in enemy and swordaction
Merge branch 'master' of https://github.com/2machten/pixel-evolution

Conflicts:
	js/player.js