Merge pull request #95 from CarlRapp/TENFIRE

Tenfire
Merge pull request #96 from CarlRapp/TENFIRE

Tenfire
Early version of WeaponInfo ( struct that will contain info about the weapon )
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma

Conflicts:
	CodenameGamma/Screen/PlayScreen/Weapons/Weapon.h
Merge pull request #97 from CarlRapp/TENFIRE

Tenfire
Merge pull request #98 from CarlRapp/master

Update