first post
another test
another trial
Update _config.jml
ok
haah
Merge branch 'gh-pages' of https://github.com/changecheng/jekyll_demo into gh-pages

Conflicts:
	_layouts/default.html
	index.html