first edits
Merge branch 'master' of https://github.com/afzal-lakdawala/dashing
clean up
more clean up
more clean up