508 Fixes
Merge branch 'master' of https://github.com/dhnelson1/TTW-Site-Redesign.git
Resolve conflict