cleanup
Merge branch 'master' of github.com:risdevs/GridGame

Conflicts:
	ProjectSettings/EditorBuildSettings.asset