updated upstream, with theme tweaks for navigation
Merge branch 'master' of https://github.com/brunomiguel/Spigot into brunomiguel-master.

Conflicts:
	theme/style.css
Merge pull request #6 from Codingbean/brunomiguel-master

CSS Updates...