Reformatting and Logo Change
Merge branch 'master' of https://github.com/SHS-Web-Development/Website