Merge branch 'gh-pages' of https://github.com/Teknocrat/LCC3403-Website into gh-pages