Keeping up changes
ignore if worked
Merge branch 'master' of https://github.com/SpokenBanana/MGSS

Conflicts:
	MGSS/MGSS/Armor.cs
	MGSS/MGSS/Game1.cs
	MGSS/MGSS/Item.cs
	MGSS/MGSS/ItemMenu.cs
	MGSS/MGSS/Pistol.cs
	MGSS/MGSS/Ration.cs
	MGSS/MGSS/Weapon.cs
	MGSS/MGSS/WeaponMenu.cs