Merge branch 'master' into panel
ovalos ok
Merge branch 'panel'

Conflicts:
	Proyecto Ingeniería de Software/src/javagui/views/main.java