jugs - theme dev
jugs-updates
Merge branch 'master' into version/jugs

Conflicts:
	css/content.less
	css/cover.less
	stylesheet.css
css - updates
updated theme and stylesheets
switched back to full page
fixed issue with itens table
owl-config.js - added responsive valuse to slideshow mode
nav-color links
Merge pull request #8 from shawnsandy/develop

Develop
updateds
Revert "updateds"

This reverts commit 45df8cd088518852fea9f0c48ee7409ca9c4d379.
boon awesome
Merge branch 'master' of github.com:shawnsandy/theme-starter
Merge branch 'version/compact-page'

Conflicts:
	css/content.less
	css/cover.less
	css/globals.less
	js/theme.js
	stylesheet.css
Merge branch 'master' of github.com:shawnsandy/theme-starter
Merge branch 'master' of github.com:shawnsandy/theme-starter

Conflicts:
	css/globals.less
	js/theme.js
	stylesheet.css