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

...to work/ash