WHY
TeamBuilder improvements
TeamBuilder improvements
Merge branch 'master' of https://github.com/milescj/cs194

Conflicts:
	Assets/Alpha_v_0.0.1.1.unity.REMOTE.68373.unity
	Assets/Alpha_v_0.0.1.1.unity.REMOTE.68373.unity.meta
	Assets/MainMenu.unity
	Assets/MainMenu.unity.meta
	Assets/Materials.meta
	Assets/Prefabs.meta
	Assets/Prefabs/Brute.prefab.meta
	Assets/Prefabs/Grunt.prefab.meta
	Assets/Prefabs/Ranger.prefab.meta
	Assets/Prefabs/UnitMan.prefab.meta
	Assets/Scripts.meta
	Assets/Scripts/MainMenu.cs.meta
	Assets/Scripts/TeamBuilder.cs.meta
	Assets/Scripts/UnitManager.cs.meta
	ProjectSettings/ProjectSettings.asset
TeamBuilder improvements