update
Merge pull request #22 from MC3D/development

Development Commits
Merge branch 'master' of github.com:millesky87/Gamerproj
Merge branch 'master' of github.com:millesky87/Gamerproj into development
Merge pull request #23 from MC3D/development

checks health when player user magic
redo
Merge branch 'master' of github.com:millesky87/Gamerproj into development
Merge branch 'master' of github.com:millesky87/Gamerproj into style_update
Merge pull request #24 from millesky87/style_update

Style update
Merge branch 'master' of github.com:millesky87/Gamerproj into development