Changed file status
Merge branch '89ao_theme'

Conflicts:
	_posts/2014-10-21-machine-learning-neural-networks.md
	assets/css/style.css
Merge branch '89ao_theme'
Merge branch 'master' of https://github.com/jiyeqian/jiyeqian.github.com

Conflicts:
	assets/css/style.css