Merge branch 'master' of https://github.com/TrofSivart/RainbowElephant

Conflicts:
	Assets/Scenes/Game.unity