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

Conflicts:
	week2_cultural_blog.html