Cleanup
gitignore
Merge commit 'e3e7501e69b1ea3573a0396d86ec056728d8bb7b'

Conflicts:
	Assets/TestLevelScene.unity
Merge