adding
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2013-03-27-java-rel.md