Bug fixing
Sentinal combat stuff
Merge pull request #4 from saxonmatt/master

Bug fixing
Merge pull request #5 from JamesHetfield/master

Whupps!