i forget to commit saturday
Merge branch 'master' of https://github.com/mrbabbs/blogandstuff

Conflicts:
	_config.yml
	_includes/header.html
	_layouts/post.html
	css/main.css
	index.html