Snurr!
Merge branch 'master' of https://github.com/mollstam/Rymden

Conflicts:
	Assets/TestScene.unity
Merge branch 'master' of https://github.com/mollstam/Rymden

Conflicts:
	Assets/TestScene.unity