rearrange stuff
Merge branch 'master' of https://github.com/coreylowman/pew-pew-pew