Revert "Merge branch 'master' of https://github.com/BritishCookieGirl/BattleBoy"

This reverts commit 3b38b7c8f5940e59fe26f083241a8108b1f9b66a, reversing
changes made to bdafa178378964e9cbe1af117ea2a41ffc3c7aee.
Big Huge Mess with some good sprinkles on top