Adding basic powerups
Merge branch 'master' into gh-pages