Disparos 50%
Merge branch 'master' of https://github.com/Double-Bacon/TheHipsterChronicles

Conflicts:
	Assets/Scenes/prueba1.unity
	Assets/Scripts/vidas.js