ASodiju
Merge branch 'master' of https://github.com/Dracir/RickiesRempage

Conflicts:
	Assets/Prefabs/GameManager.prefab
	Assets/Scenes/Gym/InifinteWorldTest.unity
	Assets/Scenes/Gym/SoundTest.unity