resolution independence
work on editor
Merge branch 'master' of github.com:risdevs/GridGame

Conflicts:
	Assets/Scenes/Editor.unity