nanana
naMerge branch 'master' of github.com:angel3071/beta

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