various work, bootstrap etc.
Merge branch 'master' of https://github.com/jackgolding/jackgolding.github.io

Conflicts:
	_layouts/default.html
	_posts/2014-01-16-welcome-to-jekyll.markdown
	css/main.css
	index.html