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

Conflicts:
	devotion/06/26.html
	devotion/06/26.md