Day 3-5 edits
resolved conflicts
Merge branch 'dhelder-david1'