Moved settimeout inside server
Merge branch 'master' of https://github.com/venom889/COMP2406-A2