Blog update at 2014-08-21 21:47:22
Blog update at 2014-08-21 21:48:50
Merge branch 'master' of https://github.com/thomaslazar/thomaslazar.github.io

Conflicts:
	index.html