added links to connect pages. consolidated login/logout. TODO: redirect after login back to previous page.
Merge pull request #6 from afalsario/alex

Alex's Commit
fixing merge conflicts