Merge Commit
Merge branch 'master' of https://github.com/scwe/NWEN304Project

Conflicts:
	Assets/Scenes/Login.unity
	ProjectSettings/EditorBuildSettings.asset
Fixes to the weird scaling on the start screenb