Superficial fixes
Merge branch 'master' of https://github.com/sboerwinkle/bounce_brawl
I don't even know. Guess I forgot to pull first.