no message
Merge branch 'master' of https://github.com/Double-Bacon/TheHipsterChronicles
disparos hechos
Merge branch 'master' of https://github.com/Double-Bacon/TheHipsterChronicles

Conflicts:
	Assets/Scenes/prueba1.unity