More punch power, now with cooldown! (and less punch power, actually)
Merge branch 'master' of https://github.com/spennerino/NewPegJamRepo2014
Merge branch 'master' of https://github.com/spennerino/NewPegJamRepo2014