Merge pull request #38 from rednaz/zan-dev-test

Zan dev test
Changed maxhealth back to 1000
Merge pull request #41 from rednaz/development

Merging dev into Zan-Dev-Test