Not done.
Merge branch 'master' of https://github.com/Maestro1337/ssha.git
Fixed first aid.
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	src/Model/Skills/Hunter/SkillArrow.java
	src/Model/Skills/Warrior/SkillFirstAid.java