orangeball deleted
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
map editor funcionando
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
first basic test
build file created
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
adding libs
fixing gitignore
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
build file with junit integrated
eliminando duplicado de mapedition
gran refactor de packages, agregando mainframe a main y pasando ventana de test a una ventana interna
Merge branch 'group1/master' of https://github.com/maxfindel/gameworks into group1/master
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/master
ffc
build
merge8
 FOR REAL.
Merge branch 'master' of github.com:maxfindel/gameworks