reup

Conflicts:
	_site/2013/09/25/useful-command-line/index.html
	_site/2013/10/07/understanding-pdf-in-ios-deeply/index.html
	_site/archive.html
	_site/atom.xml
	_site/categories.html
	_site/data mining/2013/09/24/bat-dau-voi-data-mining/index.html
	_site/index.html
	_site/ios
development/2013/09/27/audio-processing-in-ios---an-initial-step/index.h
tml
	_site/rss.xml
	_site/sitemap.txt
	_site/tags.html
	_site/tool/2013/09/28/git-and-its-tutorials/index.html
reup

Conflicts:
	.gitignore
	_site/archive.html
	_site/atom.xml
	_site/categories.html
	_site/index.html
	_site/rss.xml
	_site/sitemap.txt
	_site/tags.html