fix a bunch of shit
Merge branch 'master' of https://github.com/Broxxar/StackAttack