cleaning up styles
Merge branch 'master' of https://github.com/GraphAlchemist/alchemy

Conflicts:
	site/app/views/nav.html