Merge branch 'develop' into task-33-fix_wording_suggestions_family
[#33] Final touch up per Dad's suggestions
Merge branch 'task-33-fix_wording_suggestions_family' into develop
Merge branch 'develop'