Animator incluido

Animaciones de correr y salto añadidas
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Sprites/PSprite1.png.meta
	Assets/Sprites/payasoparao1.png.meta
	Assets/Sprites/payasoparao2.png.meta
	GJFG-csharp.sln
	GJFG.sln
	GJFG.userprefs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/9c/9c7de926b574cc0478b6bfb86bbebb58