took eli out
Merge remote-tracking branch 'remotes/github/notif2'

Conflicts:
	templates/header.php