1
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/blog/2013-04-01-dataming1.md