Octopress init
Site updated at 2014-10-07 02:29:33 UTC
Merge branch 'master' of github.com:DamianSheldon/DamianSheldon.github.io

Conflicts:
	about/index.html
	archives/index.html
	atom.xml
	blog/2014/05/09/hello-octopress/index.html
	blog/2014/05/10/objective-c-class-and-object/index.html
	blog/2014/05/10/property-values/index.html
	blog/2014/05/10/tips-and-techniques-for-framework-developers-translation/index.html
	blog/2014/05/14/ios-uiwebviewyu-javascriptjiao-hu/index.html
	blog/2014/05/19/iosde-hui-tu-xi-tong/index.html
	blog/2014/05/21/ios-concurrency-programming-gcd/index.html
	blog/2014/06/24/swift-learning-notes-initialization/index.html
	blog/2014/06/24/swift-learning-notes-properties/index.html
	blog/2014/07/28/how-to-make-didupdatelocations-compatible-with-ios-5-and-ios-6/index.html
	blog/2014/08/25/gai-bian-uiviewde-frameshi-yu-dao-de-wen-ti/index.html
	blog/2014/09/03/core-animation-bi-ji/index.html
	blog/2014/09/11/install-and-configure-openfire-on-mac-osx-mavericks/index.html
	blog/archives/index.html
	blog/categories/archives/atom.xml
	blog/categories/archives/index.html
	blog/categories/index.html
	blog/categories/ios-development/atom.xml
	blog/categories/ios-development/index.html
	blog/index.html
	blog/page/2/index.html
	blog/page/3/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-10-07 03:54:31 UTC