touch ups
Merge branch 'master' of https://github.com/ShmyQ/term-project
synched powerups
merging
merging