Attacking
Merge branch 'master' of https://github.com/Hanane-AitLakbir/TheGame.git

Conflicts:
	TheGame/src/entities/Hero.java
Hero file