adding
add category
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/ml/2013-08-07-classification.md
	_posts/programming/2012-11-10-algorithm-rel.md
	_posts/programming/2013-03-27-java-rel.md