Fixed Might & Aim bug

Realized that Might and Aim have not been adding damage correctly. They
have both been skipping a good half of base damage when giving their
percentage bonus.

This is why Might and Aim have been useless all these years.
Put damage back in at the top

Changing it meant original damage was never set.
Merge pull request #7 from M59Gar/MightAim

Might & Aim calculations fixed