Fixed some shooting things (added health and dmg)
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly