Fix merge bugs
Have powerups spawn farther out
Merge pull request #40 from rohaus/master

Fix merge bugs