Major Changes To MiniGameA, Began Implementing Framework into Game
Merge branch 'develop' of https://github.com/jfraser16/SoftwareEngineering
Merge branch 'master' of https://github.com/jfraser16/SoftwareEngineering

Conflicts:
	Assets/Scripts/MiniGameA Sheep Counting/GameArtAssets/Sheep.meta
	Assets/Scripts/MiniGameA Sheep Counting/Prefab.meta
	Assets/Scripts/MiniGameA.meta
	ProjectSettings/Physics2DSettings.asset