sidebar and 404 update
Sidebar and 404 added
Merge branch 'master' of https://github.com/jackhenderson101/Project-Prometheus

Conflicts:
	includes/header.inc.php