Merge branch 'master' of github.com:abawgus/Dish-Samurai
Merge branch 'master' of github.com:abawgus/Dish-Samurai
Merge branch 'master' of github.com:abawgus/Dish-Samurai
Merge branch 'master' of github.com:abawgus/Dish-Samurai
Neatened code; tried to make fire work.