Merge
Merge branch 'master' of https://github.com/ludditesociety/ludditesociety.github.io

Conflicts:
	css/stylesheet.css