Merge pull request #7 from gomedun/master

Si no aceptas este upstream, tus hijos me pertenecen
Merge branch 'master' of https://github.com/ceramesti/Concurso_IDGD_2014
Merge branch 'master' of https://github.com/gomedun/Concurso_IDGD_2014
Merge branch 'master' of https://github.com/gomedun/Concurso_IDGD_2014
Merge branch 'master' of https://github.com/gomedun/Concurso_IDGD_2014
framework de mapas adicionales
pequenios cambios
Limpia de Powerups, fix de enemy AI