updated prototypes.
Merge branch 'master' of github.com:jeremygreenwood/CST340-chat
fixed logical error.