Edit mini game c, timer, add light to the scene and ...
Merge branch 'develop' of https://github.com/jfraser16/SoftwareEngineering into develop

Conflicts:
	Assets/Scenes/MiniGameC.unity
	Assets/Scripts/GUI/Timer.cs
	Assets/Scripts/MiniGameA Sheep Counting.meta
	ProjectSettings/Physics2DSettings.asset