new branch
add _layouts/default.html
add _config.yml
add _posts/2014-11-10-hello-world.html
update index.html
solve the conflics

Merge remote-tracking branch 'remotes/origin/gh-pages'

Conflicts:
	index.html