how to read storm source code 1
just a test
Merge pull request #1 from zerdliu/how_to_read_storm_source_code

How to read storm source code
delete _site and index.html
delete one line
compete dev process
Merge remote-tracking branch 'upstream/master' into process_page

Conflicts:
	_site/archive.html
	_site/atom.xml
	_site/categories.html
	_site/index.html
	_site/lessons/2011/12/29/jekyll-introduction/index.html
	_site/new-page.html
	_site/pages.html
	_site/rss.xml
	_site/sitemap.txt
	_site/tags.html
	index.html
Merge pull request #4 from zerdliu/process_page

Process page
source code merge process
Merge pull request #5 from zerdliu/process_merge

source code merge process