Merge pull request #6 from joshduncan/equipment

Consumable medkits and grenades
Moved Player actions to methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battle.py
Resolving conflicts
Moved grenade and medkit code to player.py