Timeout is working
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan