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
name refactor
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
refactor de clases
name refactor
Package reference
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
Add getX and getY position methods
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
 Fucking egotistical bastard. adds expandtab to vimrc
 epic
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop