small changes
Merge branch 'work/ash' of https://github.com/okcomputer1982/dope_dukes into work/ash
no message
Merge branch 'work/ash' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/css/app.css