Nav changes
Merge branch 'master' of https://github.com/cutout/accumulo

Conflicts:
	style.css
Restoring style.css file