merge problems.
replacing old branch
recreating changes I made this morning.
journal entry UI and color settings.
changed comic ui.
fixed scroll stutter bug.
merge with master
Merge pull request #29 from okcomputer1982/work/ash

Work/ash
fixes to weekview.
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes
ds store
adding content for week 2.
add attribute panel.
bah
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes

Conflicts:
	dev/css/app.css
	dev/css/less/comic.less
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/.DS_Store
	dev/app/.DS_Store
adjusting progress bar
fixing the conflicts here
attribute window
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash