movimientos re peola
Merge branch 'master' of github.com:mdesanti/videojuegos into elpibe

Conflicts:
	tp2/src/Assets/Scenes/Level1.unity
	tp2/src/Assets/Scripts/PlayerController.cs
Added sparkles to bomb
Merge branch 'master' into elpibe

Conflicts:
	tp2/src/Library/ScriptMapper
Modifies dragon collider
Merge branch elpibe into master