Added javadoc comments to all of Combat.java as well as updated the
information in it (removed hp modifiers as those were decided to be
superfluous and changed accessors to armor modifiers to match style of
other classes). Also fixed SOME but NOT ALL spelling errors in
Combat.java

Added test for Combat.java
Wrote SkillTest and fixed appropriate bugs in Skill (one serious one in
getBonus that added the ability modifier to the base rank for the skill
sending the skill rank skyrocketing if unchecked).
Merge branch 'master' of https://github.com/MinionApp/minion.git