laura's side commit
Merge branch 'master' of https://github.com/cripplet/SE-800
Condensing server and client accept packet functions