changes i forgot to commit last night
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes

Conflicts:
	dev/css/app.css