Merge conflict resolution
Conflict resolutions
changed read me
Tidying up the mess I made from the merge
Merge branch 'gh-pages'

Conflicts:
	README.md
	_config.yml
	_layouts/default.html
	_posts/2013-07-12-1102_3-weeks.md
	_posts/2013-11-21-012321_off-the-radar.md
	_posts/2013-12-05-032453_big-ideas.md
	_site/README.md
	_site/css/main.css
	_site/index.html
	_site/scriptogram/posts/22013/12/05/032453_big-ideas.html
	css/main.css
	index.html