Javadocs actualizados
Merge branch 'group6/master' of https://github.com/maxfindel/gameworks into group6/master
fix to behavior list on character edition
Merge branch 'master' of https://github.com/maxfindel/gameworks into group6/master
Merge branch 'group3/master' of https://github.com/maxfindel/gameworks into group6/master
javadoc tirando conflicto
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group6/master
conflictos
merge6
deleting docs
merge6