Construcción de un InternalFrame de un JDesktopPane
Merge branch 'master' of https://github.com/danielibac/lab02.git

Conflicts:
	.project