Fixing merge
Validation
About Us Done for now
Merge branch 'master' into Matt