ok made a finished game 4 real
Merge branch 'Andrew-Guardian' of https://github.com/lgutlohn/RoguelikeProject into Andrew-Guardian

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Assets/GameOver.unity.meta
	Assets/Prefabs/Cannon 2.prefab
	Assets/Prefabs/Cannon 3.prefab
	Assets/Prefabs/Cannon.prefab
	Assets/Prefabs/level 3 goal.prefab
	Assets/Proto.unity.meta
	Assets/Scenes/GameOver.unity.meta
	Assets/Scenes/Level1.unity
	Assets/Scenes/Level2.unity
	Assets/Scenes/Level3.unity
	Assets/Scripts/CannonControls.cs
	Assets/Scripts/Level2Generation.cs
	Assets/Scripts/Level3Generation.cs
	Assets/Scripts/ObjectGenerator.cs
	Assets/Scripts/powerup.cs
	ProjectSettings/EditorBuildSettings.asset
	RoguelikeProject.userprefs