Ugh, accidentally included automatic formatting.
Merge branch 'master' of https://github.com/Vincentyification/JavaBot