Merge branch 'master' into marty
Merge branch 'master' into marty
Added logout functionality
Revert 566589d..b9ee5bb

This rolls back to commit 566589dc9795cee427cb60a06d4ec11554e06167.
Revert 7d50e3c..2d63b9b

This rolls back to commit 7d50e3c01d02ded3287478f7d0abe6a3c69bba09.
Took info from Dustin's branch
Merge branch 'marty'