update
update
Merge branch 'gh-pages' of https://github.com/science-gamed/sciencegamed.co.uk into gh-pages

Conflicts:
	.gitignore
	blog/2014/aug/sors-devlog-parttwo.html