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

Conflicts:
	_posts/2013-07-09-ml-basic.md