composer updater
Merge branch 'master' of https://github.com/SHSWebDesign/SHSWebsite

conflict fix