design changes
mergeMerge branch 'master' of https://github.com/jfishb01/tuneDo