Merge branch 'master' of https://github.com/mariocatch/UnicornFrenzy

Conflicts:
	Assets/Demo.unity
Merge branch 'master' of https://github.com/mariocatch/UnicornFrenzy

Conflicts:
	Assets/Demo.unity
Hopefully fixed some shit.