attributes window
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash
First day of implementing Danielle's changes.
sidebar and headers
more stuff...getting there
Umm...this is what i have.
almost done Danielle's style changes.
a lot of changes to style.
no message
no message
mostly backgrounds
Merge pull request #33 from okcomputer1982/work/warren

Work/warren
updates to buttons, header, calendar and journals
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
no message
Merge pull request #32 from okcomputer1982/work/ash

Work/ash