test configuration with ID
Merge branch 'master' of https://github.com/clay-reed-a/thefirstsite into cheryl

Conflicts:
	thefirstsite/_layouts/default.html
post file edit
Merge branch 'master' of https://github.com/clay-reed-a/thefirstsite into cheryl

Conflicts:
	thefirstsite/_posts/2013-11-24-hawksmoor.md
	thefirstsite/css/main.css
add scaffolding and css
Merge branch 'cheryl' of https://github.com/clay-reed-a/thefirstsite into cheryl

Conflicts:
	thefirstsite/_layouts/default.html
	thefirstsite/_layouts/post.html
	thefirstsite/_posts/2013-11-24-hawksmoor.md
	thefirstsite/css/main.css
	thefirstsite/index.html
css
overwritten fixes
overwritten fixes
Merge branch 'cheryl' of https://github.com/clay-reed-a/thefirstsite into cheryl
Merge branch 'master' of https://github.com/clay-reed-a/thefirstsite

Conflicts:
	thefirstsite/_posts/2013-11-24-sphinx.md