Octopress init
Site updated at 2014-01-02 15:08:32 UTC
new blog
add readme
Merge branch 'master' of github.com:welsonla/welsonla.github.com

Conflicts:
	about-welsonla/index.html
	atom.xml
	blog/2013/06/25/git-note/index.html
	blog/2014/01/02/my-2013/index.html
	blog/archives/index.html
	blog/categories/git/atom.xml
	blog/categories/gong-ju-kong/atom.xml
	blog/categories/ios/atom.xml
	blog/categories/ji-zhu-sui-bi/atom.xml
	blog/categories/sheng-huo/atom.xml
	blog/categories/sui-bi/atom.xml
	blog/categories/sui-bi/index.html
	blog/page/2/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
add ipa
Merge branch 'master' of github.com:welsonla/welsonla.github.com