merged my recent with the pulled upstream master
updated merge conflict
made the username a cookie that terminates on browser session close
Merge pull request #14 from CTFigueroa/master

made the username a cookie that terminates on browser session close