burgers
Merge branch 'master' of https://github.com/Jdbermeo/TareasComputacional

Conflicts:
	Tarea_6/evolvet.c
	Tarea_6/evolvet.c~