again
Merge branch 'master' of https://github.com/Tavrox/4E_Sinusoid

Conflicts:
	Assets/scenes/Thomas.unity