Submitting most up to date version

Still trying to fix a bug with health decrementation