top nab, center logo, white background
Merge branch 'master' of https://github.com/johnsone2/rox-proposals

Conflicts:
	_nav.php
removed dead code, added social links
set current page to active in nav
switched to accordion
added bootstrap classes, changed width
minor tweaks