Fixed damage type.
Merge branch 'master' into shield-improvements
Merge pull request #9 from nilsbrummond/shield-improvements

Shield improvements