testing fixes
Merge branch 'master' of https://github.com/maradine/ps2bot

wat
Merge branch 'master' of https://github.com/maradine/ps2bot
oops
pasting successfully