centred kinda
Merge remote-tracking branch 'origin/master'

Conflicts:
	Webpage/about.html
	Webpage/temp.html
Merge branch 'master' of https://github.com/tamara-h/pod

Conflicts:
	Webpage/temp.html