Implement 2 different moving strategies for enemies
Increase player HP
Push enemies back when hitting them
Merge branch 'enemies'
Merge branch 'master' into weapons

Conflicts:
	src/main/resources/world.xml
removed weaponId
Implement weapons
Implement weapons
fix test
Implement weapon indicator
added equipButton functionality
added equipButton functionality
added equipButton functionality