SwingDemo

Signed-off-by: asr245 <andresj.soria@tic.alten.es>
Merge branch 'master' of https://github.com/ajsoriar/EditorDeFiguras into prueba

Signed-off-by: asr245 <andresj.soria@tic.alten.es>

Conflicts:
	EditorDeFiguras$1.class
	EditorDeFiguras$2.class
	EditorDeFiguras.class
some changes

Signed-off-by: asr245 <andresj.soria@tic.alten.es>
gitignore

Signed-off-by: asr245 <andresj.soria@tic.alten.es>
Merge pull request #2 from ajsoriar/prueba

Prueba