Merge branch 'mia' of https://github.com/unkersoul/Quimiorretas

Conflicts:
	cambios.txt
Merge branch 'master' of https://github.com/unkersoul/Quimiorretas

Conflicts:
	cambios.txt