updated
Merge branch 'master' of github.com:shawnsandy/theme-starter

Conflicts:
	css/comments.less
top-nav fixes