narrow.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main2.css
	footer.php
	nav2.php