Merge branch 'hotfix/wp-issues'
Merge pull request #12 from shawnsandy/version/bj-timber

added comments less
Merge branch 'master' of https://github.com/shawnsandy/theme-starter
updated
Merge branch 'master' of github.com:shawnsandy/theme-starter

Conflicts:
	css/comments.less
top-nav fixes
Merge branch 'master' of https://github.com/shawnsandy/theme-starter
Merge branch 'master' into version/bj-timber