algo
Merge branch 'master' of https://github.com/angel3071/beta

Conflicts:
	src/com/example/graficador/GraficaTemp.java