log out work
Merge branch 'master' into steph
log out logic finished
Merge pull request #12 from ahsterling/steph

Steph