cleanup
display user name and handle log-in/out
merge master into fb2
dumb line
merge master again
Merge pull request #9 from rhokbrisbane/fb2

Fb2
Merging master into front_end