Latest update

A few new people, publications and updated events page
update
Tidied up conflicts
Merge branch 'master' of https://github.com/yemling/BritGeoThermal

Conflicts:
	events/home.html
	people/home.html
	people/younger.html
	projects/cheshire.html
	publications/home.html