Make buffs (kind of) work
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/fuzzything44/RPG-Simulator