bootstrap 3
Merge branch 'master' of https://github.com/Matadoer/matadoer.github.io

Conflicts:
	README.md
	Rakefile
	_config.yml
	_includes/JB/analytics
	_includes/JB/analytics-providers/piwik
	_includes/themes/twitter/default.html
	_includes/themes/twitter/page.html
	_includes/themes/twitter/post.html
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html
	_posts/core-samples/2011-12-29-jekyll-introduction.md
	assets/themes/twitter/bootstrap/css/bootstrap.2.2.2.min.css
	assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
	assets/themes/twitter/bootstrap/img/glyphicons-halflings.png
	assets/themes/twitter/css/style.css
	index.md