Moar changes
Merge branch 'master' of https://github.com/guitpicker07/battle-hacks