added damage equations
changes so merge
Merge branch 'master' of https://github.com/benstreb/RPGme
fixed a state bug
fixed merge conflicts