"update: reinstall
Merge branch 'master' of https://github.com/tinxing/tinxing.github.com into source

Conflicts:
	Gemfile.lock
	Rakefile
	_config.yml