aja que mal ingles
...
plataform and saw update
...
before merge
Merge remote-tracking branch 'origin/2DFall' into 3DFall

Conflicts:
	Game/Assets/Resources.meta
	Game/ProjectSettings/TagManager.asset