Committing to pull
Merge branch 'master' of https://github.com/gundermanc/eecs290-unity3d-final
Potential health bar fix?