Arreglando conflictos en escena principal
Merge branch 'master' of https://github.com/edgarxpc/Unity2DGame

Conflicts:
	Assets/Scenes/Gameplay.unity