Fixed conflicts in header.php
Revert "Fixed conflicts in header.php"

This reverts commit b3a75329d8227795132dc833f7fcbb2bd6d87c00.
Debugging sessions
Fighting with git
Still fighting with git
Sessions working! You will get a notice about something, but everything still works. I'll sort that out, but I haven't got my logic straight yet.