Fixed some derpyness
Merge remote-tracking branch 'refs/remotes/origin/theAzack9'
fixed ip
Merge branch 'refs/heads/master' into Dritory