redone video and changed login behavior
redone video, changed login behavior
Merge branch 'master' of https://github.com/CMPUT301F14T11/TEAMLORT