changed powerup cooldown to 10 from 1
Merge branch 'master' into gh-pages