Comments

This was a commit to sync with work pc
Merge branch 'master' of https://github.com/Kroggie/tileGame

Conflicts:
	Assets/Editor/TileMapEditor.cs
	Assets/TileMap.cs
	Assets/tileGame.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/27/271188726101e4b47b953138bd02ee92
	Library/metadata/e3/e3063859fc3006844ac309bc40e29dd0
	tileGame.userprefs