changing the assignment and journals grade week navigation
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash
Merge pull request #20 from okcomputer1982/work/warren

Work/warren
color removal
further color removal and baseline changes.
Merge pull request #21 from okcomputer1982/work/warren

Work/warren
trying color swatches on sidebar
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/navs.less
	dev/templates/templates.js
changed the sidebar....for the better?  Gonna come back and look at it...
committing something tits.
Took out glitch that made the header change size and that which made the content too big for the container
Trying out some colors.
removal of welcome pane
Merge branch 'master' into work/warren
Merge pull request #22 from okcomputer1982/work/warren

Work/warren
profile section styling.
profile page styling
profile - removal of the feedback section (for putting into a modal later), and removal of the settings pane.
update to the grades UI
no message