Meth delc return type
Merge Sides
Merge branch 'SideA' of https://github.com/osacr6/MiniJava into SideA

Conflicts:
	files/prueba_2.txt
	src/Contextual/Contextual.java