conflicto
Merge branch 'master' of https://github.com/RollingGarbanzo/Solutemp

Conflicts:
	erwrwe.txt