Logan did stuff
Merge branch 'master' of https://github.com/Heia-/Imagine

Conflicts:
	Assets/main.unity