Fixed Nav Bar
Fixed Conflicts with Nav Update

Conflicts:
	header.php
	style.css