Spikes that holds
Merge branch 'master' of https://github.com/Dracir/semicolon

Conflicts:
	Assets/Scenes/Gym/TravGym.unity