Added a login/ logout link on the bottom of the screen
Resolved conflict with merge