Merge branch 'crichards' of git://github.com/couryrr/TeamContent into develop
Created head.php
Moved <head> contents from ../about to head.php
Finished adding head.php to tmpl/*/index.php pages
Merge branch 'standardCSS' into develop
Created header.php to hold the nav bar across all pages.
Added Articles dropdown to nav header
Added nav header to tmpl/*/index.php pages
Merge branch 'createHeader' into develop
Added missing link to passwords article
Added styling and nav header to login processing.
This is a horrible hack. It works, but does not flow well with the home
page/process page split.
Added style and header to results page.
Merge branch 'processedStyle' into develop
Added Logout and Preferences links in dropdown.
Merge branch 'profileDropdown' into develop
Added Profile and Timeline links to nav.
Merge branch 'navProfileTimeline' into develop
Styled submit button
Moved large header from timeline to about
Fixed merge issues