modifiers for all combinations of weaponTypes and enemyTypes
enums for weaponType
added class Combat and WeaponType to git
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014

Conflicts:
	Assets/Character/CharacterData.cs