bootstrap
Merge github.com:xzedx/xzedx.github.io

Conflicts:
	_config.yml
	_layouts/default.html
	_layouts/post.html
ts