Merge branch 'master' of https://github.com/dhnelson1/TTW-Site-Redesign

Conflicts:
find-help-results.html
find-help.html
swapped out the conflict files