Blaine Fucked Up
Merge branch 'Dori' into Programmers

Conflicts:
	MI/Assets/Programming/Dori/Prefabs/Defense Class Player.prefab
	MI/Assets/Programming/Dori/Scenes/scene_defense_demo.unity
	MI/Assets/Programming/Dori/Scenes/scene_offense_demo.unity
	MI/Assets/Programming/Dori/Scripts/DefenseAddShield.cs
	MI/Assets/Programming/Dori/Scripts/DefenseAmmoRegen.cs
	MI/Assets/Programming/Dori/Scripts/OffenseCamo.cs
	MI/Assets/Programming/Dori/Scripts/OffenseMarkEnemy.cs
	MI/Assets/Programming/Dori/Scripts/Player.cs
	MI/Assets/Programming/Dori/Scripts/SupportHealthRegen.cs
	MI/Assets/Programming/Dori/Scripts/SupportSpeedBoost.cs
	MI/Assets/Programming/Dori/Scripts/XPTracker.cs