added login and logout links
merge new code and database
Merge pull request #6 from EdmundMai/master

added login and logout links