Musica
Merge branch 'master' of https://github.com/maxi3390/GGJ2014

Conflicts:
	Assets/d.unity
Merge branch 'master' of https://github.com/maxi3390/GGJ2014
Algunos Sonidos
Arreglados problemas --no todo-- del salto doble
Merge con la rama sonidos
Version semi estable