Octopress init
Site updated at 2014-07-14 19:36:41 UTC
Merge branch 'master' of github.com:skyebook/skyebook.github.io

Conflicts:
	atom.xml
	blog/categories/amazon-web-services/atom.xml
	blog/categories/android/atom.xml
	blog/categories/audio/atom.xml
	blog/categories/betaville/atom.xml
	blog/categories/cassandra/atom.xml
	blog/categories/computer-love/atom.xml
	blog/categories/digital-content-creation/atom.xml
	blog/categories/education/atom.xml
	blog/categories/food/atom.xml
	blog/categories/gis/atom.xml
	blog/categories/google/atom.xml
	blog/categories/life/atom.xml
	blog/categories/open-source/atom.xml
	blog/categories/openshift/atom.xml
	blog/categories/openstreetmap/atom.xml
	blog/categories/programming/atom.xml
	blog/categories/social/atom.xml
	blog/categories/thesis/atom.xml
	blog/categories/tips/atom.xml
	blog/categories/travel/atom.xml
	blog/categories/video/atom.xml
	blog/categories/web/atom.xml
	blog/categories/wordpress/atom.xml
	sitemap.xml
	stylesheets/screen.css