Merge pull request #4 from gomedun/master

Agregue Pausa y Reset
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
Impresion y generacion de powerups
Merge pull request #5 from gomedun/master

Up to Date
Merge pull request #6 from ceramesti/master

powerup generation
Olvide jalar powerups
manual merge