master
add cname
build
default layouts
Create gh-pages branch via GitHub
update merge
Merge branch 'gh-pages' of github.com:ampvchen/vchen.me into gh-pages

Conflicts:
	_layouts/default.html
	_site/index.html
	_site/jekyll/update/2013/11/09/welcome-to-jekyll.html