Changed structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	_config.yml
	_layouts/default.html
	_posts/2012-12-24-delete-a-thing.md
	_posts/2012-12-25-put-a-thing.md
	assets.css