added overlap prefab (apparently didn't work last time)
update ignore list to not ignore the meta files
added .meta files
prototype for save/load done
Troop Movements
started UML diagram
changed layer multiplier to 100 from 10
UML diagram update
Added my Prototypes, Tower Loyalty and Tower Spanwning
workin out UML things
Merge branch 'dev'

Conflicts:
	FinalProjectTests/ProjectSettings/AudioManager.asset
	FinalProjectTests/ProjectSettings/DynamicsManager.asset
	FinalProjectTests/ProjectSettings/EditorSettings.asset
	FinalProjectTests/ProjectSettings/GraphicsSettings.asset
	FinalProjectTests/ProjectSettings/InputManager.asset
	FinalProjectTests/ProjectSettings/NavMeshLayers.asset
	FinalProjectTests/ProjectSettings/NetworkManager.asset
	FinalProjectTests/ProjectSettings/Physics2DSettings.asset
	FinalProjectTests/ProjectSettings/QualitySettings.asset
	FinalProjectTests/ProjectSettings/TagManager.asset
	FinalProjectTests/ProjectSettings/TimeManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/AudioManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/DynamicsManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/EditorSettings.asset
	Overlap Prototype/Prototypes/ProjectSettings/GraphicsSettings.asset
	Overlap Prototype/Prototypes/ProjectSettings/InputManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/NavMeshLayers.asset
	Overlap Prototype/Prototypes/ProjectSettings/NetworkManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/Physics2DSettings.asset
	Overlap Prototype/Prototypes/ProjectSettings/ProjectSettings.asset
	Overlap Prototype/Prototypes/ProjectSettings/QualitySettings.asset
	Overlap Prototype/Prototypes/ProjectSettings/TagManager.asset
	Overlap Prototype/Prototypes/ProjectSettings/TimeManager.asset
	Prototypes/Assets/LevelSelector.unity.meta
	Prototypes/Assets/Resources.meta
	Prototypes/Assets/Resources/Scripts.meta
	Prototypes/Assets/Resources/Scripts/LevelLoader.cs.meta
	Prototypes/Assets/Resources/Scripts/ReturnToSelector.cs.meta
	Prototypes/Assets/Resources/SquadMovement.meta
	Prototypes/Assets/Resources/SquadMovement/MultipleSquadMovement.unity.meta
	Prototypes/Assets/Resources/SquadMovement/Squad.prefab.meta
	Prototypes/Assets/Resources/SquadMovement/SquadBehavior.cs.meta
	Prototypes/Assets/Resources/SquadMovement/SquadManager.cs.meta
	Prototypes/Assets/Resources/SquadMovement/SquadManager.prefab.meta
	Prototypes/Assets/Resources/SquadMovement/SquadMovement.unity.meta
	Prototypes/Assets/Resources/SquadMovement/SquadUnit.cs.meta
	Prototypes/Assets/Resources/SquadMovement/SquadUnit.prefab.meta
	Prototypes/Assets/Resources/SquadMovement/WorldBorder.prefab.meta
	Prototypes/Assets/Resources/Textures.meta
	Prototypes/Assets/Resources/Textures/Icon.png.meta
	Prototypes/Assets/Resources/Textures/blackbox.png.meta
	Prototypes/Assets/Resources/Textures/crosshair.png.meta
	Prototypes/Assets/Resources/Textures/swordsman.png.meta
	Prototypes/Assets/Resources/Textures/yellow.png.meta
	Prototypes/Assets/Resources/UnitMovement.meta
	Prototypes/Assets/Resources/UnitMovement/Enemy.prefab.meta
	Prototypes/Assets/Resources/UnitMovement/EnemyBehavior.cs.meta
	Prototypes/Assets/Resources/UnitMovement/MultipleUnitMovement.unity.meta
	Prototypes/Assets/Resources/UnitMovement/Swordsman.prefab.meta
	Prototypes/Assets/Resources/UnitMovement/SwordsmanBehavior.cs.meta
	Prototypes/Assets/Resources/UnitMovement/World.cs.meta
	RenderOverlap/Assets/SetRendererLayer.cs
	RenderOverlap/ProjectSettings/AudioManager.asset
	RenderOverlap/ProjectSettings/DynamicsManager.asset
	RenderOverlap/ProjectSettings/EditorSettings.asset
	RenderOverlap/ProjectSettings/GraphicsSettings.asset
	RenderOverlap/ProjectSettings/InputManager.asset
	RenderOverlap/ProjectSettings/NavMeshLayers.asset
	RenderOverlap/ProjectSettings/NetworkManager.asset
	RenderOverlap/ProjectSettings/Physics2DSettings.asset
	RenderOverlap/ProjectSettings/QualitySettings.asset
	RenderOverlap/ProjectSettings/TimeManager.asset
	SaveLoad/ProjectSettings/ProjectSettings.asset
	SaveLoad/ProjectSettings/TagManager.asset
	SaveLoad/TestBuild/test1_Data/output_log.txt
	TowerSpawn/ProjectSettings/ProjectSettings.asset
adding back .asset
Added final project
UML update
Created scenes and updated settings.
laid out MouseManager
Added sub folders for each scene
started enemy logic
Added Tower behavior files. Put them in a tower folder. Added tower Prefabs.
Merge branch 'master' into james_dev

Conflicts:
	FinalProject/Assets/Scenes/Game.unity
Fixed abstract class