Changed A LOT!
Merge branch 'Game' of https://github.com/JonathanWe/Shooterfornaow into Game

Conflicts:
	Shooter/Shooter/Shooter/Shooter.csproj.Debug.cachefile

	modified:   Shooter/Shooter.suo
	modified:   Shooter/Shooter/Shooter/BackgroundSound.cs
	modified:   Shooter/Shooter/Shooter/Bullet.cs
	modified:   Shooter/Shooter/Shooter/Camera.cs
	modified:   Shooter/Shooter/Shooter/Character.cs
	modified:   Shooter/Shooter/Shooter/CharacterCustomization.cs
	modified:   Shooter/Shooter/Shooter/Cursor.cs
	modified:   Shooter/Shooter/Shooter/Enemy.cs
	modified:   Shooter/Shooter/Shooter/Engine.cs
	modified:   Shooter/Shooter/Shooter/GUI/Button.cs
	modified:   Shooter/Shooter/Shooter/GUI/ChechBox.cs
	modified:   Shooter/Shooter/Shooter/GUI/TextBox.cs
	modified:   Shooter/Shooter/Shooter/Map.cs
	modified:   Shooter/Shooter/Shooter/MapGrid.cs
	modified:   Shooter/Shooter/Shooter/Menu.cs
	modified:   Shooter/Shooter/Shooter/Modding/MapEditor/MapEditor.cs
	modified:   Shooter/Shooter/Shooter/Player.cs
	modified:   Shooter/Shooter/Shooter/Shooter.csproj.Debug.cachefile
	modified:   Shooter/Shooter/Shooter/Weapon.cs
	modified:   Shooter/Shooter/ShooterContent/ShooterContent.contentproj
	modified:   Shooter/Shooter/ShooterContent/Weapons/Sub.txt