Merge branch 'master' of github.com:maxfindel/gameworks into group1/master
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/master
framedemo
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/master
ventana de edicion de personaje con dialog para cargar sprites [sin terminar]
Primera version de vista de edicion de personajes con codigo ordenado (guia a seguir para otras vistas)
prueba de map editor
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
mapEditor con addObject implementado
mapEditor con addObject implementado con comentarios de clases
ordenando codigo
MainFrame class
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
Entrega1
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/master
Merge branch 'group1/master' of https://github.com/maxfindel/gameworks into group1/master

Conflicts:
	src/Main.java
merge group1/master
fix merge
Remove src duplicate