no message
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes
Merge pull request #4 from okcomputer1982/refactor/class-styles

Refactor/class styles
horizontal navigationism
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes

Conflicts:
	dev/class_view_prototype/css/less/app.less
took out conflicts
sidebar stuff
Merge branch 'refactor/class-styles' of https://github.com/okcomputer1982/dope_dukes

Conflicts:
	dev/class_view_prototype/css/less/app.less
	dev/css/app.css
popovers for the sidebar...need work.
Merge branch 'refactor/class-styles' of https://github.com/okcomputer1982/dope_dukes

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