ds store
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/.DS_Store
	dev/app/.DS_Store
adjusting progress bar
Merge pull request #30 from okcomputer1982/work/ash

Work/ash