deleted:    .directory
Merge branch 'master' of github.com:baham/baham.github.com

Conflicts:
	atom.xml
	blog/categories/android/atom.xml
	blog/categories/android/index.html
	blog/categories/announcement/atom.xml
	blog/categories/announcement/index.html
	blog/categories/baham-studio/atom.xml
	blog/categories/baham-studio/index.html
	blog/categories/baham/atom.xml
	blog/categories/baham/index.html
	blog/categories/bible/atom.xml
	blog/categories/bible/index.html
	blog/categories/blender/atom.xml
	blog/categories/blender/index.html
	blog/categories/book/atom.xml
	blog/categories/book/index.html
	blog/categories/bridge/atom.xml
	blog/categories/bridge/index.html
	blog/categories/cg/atom.xml
	blog/categories/cg/index.html
	blog/categories/chromiumos/atom.xml
	blog/categories/chromiumos/index.html
	blog/categories/coal/atom.xml
	blog/categories/coal/index.html
	blog/categories/code/atom.xml
	blog/categories/code/index.html
	blog/categories/cumt/atom.xml
	blog/categories/cumt/index.html
	blog/categories/driving/atom.xml
	blog/categories/driving/index.html
	blog/categories/edu/atom.xml
	blog/categories/edu/index.html
	blog/categories/experience/atom.xml
	blog/categories/experience/index.html
	blog/categories/faith/atom.xml
	blog/categories/faith/index.html
	blog/categories/fate/atom.xml
	blog/categories/fate/index.html
	blog/categories/firewall/atom.xml
	blog/categories/firewall/index.html
	blog/categories/football-game/atom.xml
	blog/categories/football-game/index.html
	blog/categories/game-theory/atom.xml
	blog/categories/game-theory/index.html
	blog/categories/game/atom.xml
	blog/categories/game/index.html
	blog/categories/geek/atom.xml
	blog/categories/geek/index.html
	blog/categories/github/atom.xml
	blog/categories/github/index.html
	blog/categories/golang/atom.xml
	blog/categories/golang/index.html
	blog/categories/google/atom.xml
	blog/categories/google/index.html
	blog/categories/hack/atom.xml
	blog/categories/hack/index.html
	blog/categories/history/atom.xml
	blog/categories/history/index.html
	blog/categories/humanity/atom.xml
	blog/categories/humanity/index.html
	blog/categories/ideas/atom.xml
	blog/categories/ideas/index.html
	blog/categories/internship/atom.xml
	blog/categories/internship/index.html
	blog/categories/java-zone/atom.xml
	blog/categories/java-zone/index.html
	blog/categories/java/atom.xml
	blog/categories/java/index.html
	blog/categories/javascript/atom.xml
	blog/categories/javascript/index.html
	blog/categories/job/atom.xml
	blog/categories/job/index.html
	blog/categories/linux/atom.xml
	blog/categories/linux/index.html
	blog/categories/management/atom.xml
	blog/categories/management/index.html
	blog/categories/memo/atom.xml
	blog/categories/memo/index.html
	blog/categories/mensa/atom.xml
	blog/categories/mensa/index.html
	blog/categories/mineral-processing/atom.xml
	blog/categories/mineral-processing/index.html
	blog/categories/mooc/atom.xml
	blog/categories/mooc/index.html
	blog/categories/movie/atom.xml
	blog/categories/movie/index.html
	blog/categories/ms/atom.xml
	blog/categories/ms/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/ruby/atom.xml
	blog/categories/ruby/index.html
	blog/categories/sagemath/atom.xml
	blog/categories/sagemath/index.html
	blog/categories/secure/atom.xml
	blog/categories/secure/index.html
	blog/categories/seo/atom.xml
	blog/categories/seo/index.html
	blog/categories/share/atom.xml
	blog/categories/share/index.html
	blog/categories/software/atom.xml
	blog/categories/software/index.html
	blog/categories/technology/atom.xml
	blog/categories/technology/index.html
	blog/categories/ted/atom.xml
	blog/categories/ted/index.html
	blog/categories/thinking/atom.xml
	blog/categories/thinking/index.html
	blog/categories/tips/atom.xml
	blog/categories/tips/index.html
	blog/categories/translation/atom.xml
	blog/categories/translation/index.html
	blog/categories/travel/atom.xml
	blog/categories/travel/index.html
	blog/categories/tv/atom.xml
	blog/categories/tv/index.html
	blog/categories/utb/atom.xml
	blog/categories/utb/index.html
	blog/categories/video/atom.xml
	blog/categories/video/index.html
	blog/categories/wordpress/atom.xml
	blog/categories/wordpress/index.html
	contactme-en/index.html
	contactme/index.html
	sitemap.xml