Added neural networks
Merge conflict
remove _site
Merge branch '89ao_theme'
Merge branch '89ao_theme'
Remove draft equations
Merge branch '89ao_theme'
Improved CSS
Merge branch '89ao_theme'
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'

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
Merge branch '89ao_theme'
Modified CSS
Merge branch '89ao_theme'
Merge branch '89ao_theme'

Conflicts:
	_layouts/default.html
	assets/css/style.css
Changed Pages