Add check for username in session
t iMerge branch 'master' of https://github.com/tmlai/CMPUT410-TTHE-Group-Project

Merge with change on server