I dunno why it wants me to do this

So yeah
Merge branch 'master' of https://github.com/MxChamp24/TeamworkAssignmentKyleGrady

Conflicts:
	TEAMWORK/Assets/Gameplay.unity