add new article
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-05-27-More-effective-Java.md