removed dev/css since it's moved to dev/app/css
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into ash/class-vew

Conflicts:
	dev/css/app.css