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

Conflicts:
	details/index.html