fix merge conflicts
Merge branch 'master' of github.com:cynthiawu/data-analysis-template
Merge branch 'master' of github.com:cynthiawu/data-analysis-template