Just played with some stuff

Just playing around.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scene.unity
Revert "Just played with some stuff"

This reverts commit 279516b10792c34bd7e1f235b0676c85a049659c.