Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into refactor/class-styles

Conflicts:
	dev/css/app.css
	dev/css/less/base.less
	dev/css/less/fonts.less
fixing things
ugh