Update combat.cpp
Update combat.cpp
implementing start of magic system
moving magic class out of this
Update combat.h
Create magic.h
Create magic.cpp
Merge pull request #9 from Elder-Sage/master

early morning work