STUFF WORKS
Merge branch 'master' of https://github.com/SHSWebDesign/SHSWebsite

Login + whatever andy did
Merge branch 'master' of https://github.com/SHSWebDesign/SHSWebsite

Login and stuff