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

Conflicts:
	_includes/themes/bootstrap-3/post.html