log4j
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-06-19-log4j-in-detail.md