menu
Merge branch 'master' of github.com:jeslev/Tarea1Numerico

Conflicts:
	ErrorCalc.py