Push de prueba a Jenkins
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
comments for map edition classes
Merge branch 'group1/master' of https://github.com/maxfindel/gameworks into group1/develop
merge with all branches
merge with master branch
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
merge without src. in path for packages
fixing merge conflict
merging game.java
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
log updated
final log update
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
res image to res images
build
Merge branch 'group7/master' into group7/develop