a
a
a
Merge branch 'theme-v1'

Conflicts:
	.gitignore
	.sass-cache/acaea8b7d3a4543861d8706e34277cf1290e9669/_layout.scssc
	_config.yml
	_includes/footer.html
	_includes/header.html
	_sass/_layout.scss
	_site/about/index.html
	_site/css/main.css
	_site/feed.xml
	_site/index.html

merge theme-v1 first
a
a
Merge branch 'theme-v1'

test
a
Merge branch 'theme-v1'

retest