removing conflicts
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes

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