yes
Merge branch 'master' of https://github.com/BatedUrGonnaDie/salty_bot
moved stuff
yes
yes
removed unneccessary imports