Ignore

.gitignore
Sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity Project/ProjectSettings/TagManager.asset