update
Merge branch 'master' of https://github.com/studentdeng/studentdeng.github.com

Conflicts:
	atom.xml
	blog/categories/algorithms/atom.xml
	blog/categories/apache/atom.xml
	blog/categories/apple-script/atom.xml
	blog/categories/asm/atom.xml
	blog/categories/box2d/atom.xml
	blog/categories/c-plus-plus/atom.xml
	blog/categories/configure/atom.xml
	blog/categories/emotion/atom.xml
	blog/categories/exercise/atom.xml
	blog/categories/game/atom.xml
	blog/categories/git/atom.xml
	blog/categories/ios/atom.xml
	blog/categories/mysql/atom.xml
	blog/categories/notes/atom.xml
	blog/categories/objective-c/atom.xml
	blog/categories/operating-system/atom.xml
	blog/categories/ruby/atom.xml
	blog/categories/stl/atom.xml
	blog/categories/tips/atom.xml
	blog/categories/webbench/atom.xml
	blog/categories/windows-mobile/atom.xml
	blog/categories/windows/atom.xml
	blog/categories/wpf-slash-sl/atom.xml
	blog/categories/yun-wei/atom.xml
	index.html
	sitemap.xml