merge
Merge branch 'master' of https://github.com/San-Diego/PHP-Teamwork
add logout(if the user is logged in)