no message
Merge branch 'master' of https://github.com/shawnsandy/theme-starter

Conflicts:
	stylesheet.css
Merge branch 'master' of https://github.com/shawnsandy/theme-starter
fixed style issues with sidebar markuo
Merge branch 'hotfix/widget_header'