asdf
Merge branch 'master' of https://github.com/samjhill/6g1w

Conflicts:
	about.php
	css/style.css
	gallery.php