modified:   _config.yml
	modified:   _config.yml
	modified:   _includes/themes/twitter/default.html
	modified:   assets/themes/twitter/bootstrap/css/bootstrap.2.2.2.min.css
	modified:   assets/themes/twitter/css/style.css
Merge branch 'master' of github.com:shuwi/shuwi.github.com

Conflicts:
	_config.yml

	modified:   _config.yml