Organized things a little, broke things a lot
Merge branch 'master' of https://github.com/DanBrink91/CanvasBomber