new file:   _posts/2014-08-09-.md
	new file:   _posts/2014-08-11-.md
	deleted:    _posts/core-samples/2011-12-29-jekyll-introduction.md
	deleted:    _posts/core-samples/2011-12-29-jekyll-introduction.md
Merge branch 'master' of github.com:simontaosim/simontaosim.github.io

Conflicts:
	_posts/2014-08-09-.md
	.git/MERGE_HEAD

	new file:   ../_plugins/category_plugin.rb
	modified:   2014-08-09-.md
	new file:   ../myblog.komodoproject