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

Conflicts:
	dev/css/app.css
	dev/css/less/fonts.less
Merge branch 'refactor/class-styles' of https://github.com/okcomputer1982/dope_dukes into refactor/class-styles

Conflicts:
	dev/css/app.css
	dev/css/less/fonts.less
horizontal top navigation
Merge branch 'refactor/class-styles' of https://github.com/okcomputer1982/dope_dukes into refactor/class-styles

Conflicts:
	dev/css/app.css
fixed conflicts
Merge pull request #6 from okcomputer1982/refactor/class-styles

Pattern Library and Styling Tweaks
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into ash/basic

Conflicts:
	dev/class_view_prototype/css/less/app.less
	dev/css/app.css