Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	.DS_Store
	dev/.DS_Store
	dev/css/app.css
	dev/css/less/components.less
	dev/css/less/profile.less
	dev/images/.DS_Store
Merge branch 'work/ash' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/.DS_Store
	dev/css/app.css
	dev/css/less/components.less
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash
Styling edits for:

## H1s remove borders
## backgrounds
## sidebar - make it dark with no backgrounds for buttons
badge backgrounds
small changes
Merge branch 'work/ash' of https://github.com/okcomputer1982/dope_dukes into work/ash
header and footer stuff
no message
Merge branch 'work/ash' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/css/app.css
stuff
font playings
mostly font-changes.
a lot of stuff
badge link blue
homepage styling.
Added tooltips to badges and added background changes as well.
finally finished the attributes.  Grades still have to be done
stuff
cooler bricks