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

Conflicts:
	dev/css/app.css
	dev/css/less/comic.less
fixing the conflicts here
attribute window
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash