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

This is a test
Umm

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

Very annoyed