Merge remote-tracking branch 'remotes/Edu/master'
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Dani/master'
Merge branch 'master' of https://github.com/roig/MVJ2D
Simple implementation of enemy.
Merge branch 'master' of https://github.com/roig/MVJ2D
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D
Add enemies.png
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D
move bool
Getters Debug mode.
Merge remote-tracking branch 'remotes/Edu/master'
Fix fix...
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge branch 'master' of http://github.com/marcelgozalbo/MVJ2D
Canvis per a que compili d'en Marcel.