made attack/damage/health interaction a little cleaner
Merge branch 'dev' of https://github.com/MAVG-Programmers/Jeden-Public into dev