Merge branch 'templates' of https://github.com/csesoc/csesoc-website-v2 into templates
Merge branch 'templates' of https://github.com/csesoc/csesoc-website-v2 into templates
Fixed header bugs