Octopress init
Site updated at 2014-06-21 15:51:39 UTC
Site updated at 2014-06-21 15:59:00 UTC
Merge branch 'master' of github.com:bigman85/bigman85.github.io

Conflicts:
	404.html
	about/index.html
	atom.xml
	blog/2014/06/17/ios-develop-resource/index.html
	blog/2014/06/18/convert-white-backgound-to-transparent-with-photoshop/index.html
	blog/2014/06/18/node-dot-js-resource/index.html
	blog/2014/06/20/program-resources/index.html
	blog/2014/06/21/install-mongodb-on-mac/index.html
	blog/archives/index.html
	blog/categories/install/atom.xml
	blog/categories/install/index.html
	blog/categories/ios/atom.xml
	blog/categories/ios/index.html
	blog/categories/mac/atom.xml
	blog/categories/mac/index.html
	blog/categories/mongodb/atom.xml
	blog/categories/mongodb/index.html
	blog/categories/node-dot-js/atom.xml
	blog/categories/node-dot-js/index.html
	blog/categories/photoshop/atom.xml
	blog/categories/photoshop/index.html
	blog/categories/resource/atom.xml
	blog/categories/resource/index.html
	blog/categories/tutorial/atom.xml
	blog/categories/tutorial/index.html
	index.html
	robots.txt
	sitemap.xml
Site updated at 2014-06-21 16:15:27 UTC