It thinks i changed something...
Merge branch 'master' of https://github.com/BritishCookieGirl/BattleBoy

Conflicts:
	Flamboyant_Battle_Boy/Assets/_Prefabs/Player.prefab
	Flamboyant_Battle_Boy/Assets/_Scenes/MenusMerged.unity