Merge pull request #22 from sinjax/master

Tidied things up
removed unnecessary whitespace
fixed ATT calculation in attack() from branch temp
added attack and defence actions from branch temp
fixed some errors with merge of combat.py, added new test_combat_actions.py
Uploaded new version of document as docx

System now includes some of the changes we suggested including:

- WER (sometimes called WAR in notes for some reason) advantage when
aiming capped by weapon skill
- Shooting into melee lock now has a system making it more chaotic
- Fleeing is now harder
- Rules on Melee lock chains clarified. Added diagram.
- Weapon Skill renamed Combat Skill, description changed to reflect its
composite nature
- Combat skill makes changing weapons easier
- New rules in picking opportunity for big gaps (more then double) in
combat skill

I'll post further details in the issue tracker.