config stuff
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
removed stuff
Merge branch 'master' into gh-pages

Conflicts:
	_site/coffee-table/index.html
	_site/contact/index.html
	_site/desk-lamp/index.html
	_site/eames-plywood-chair/index.html
	_site/eames-task-chair/index.html
	_site/index.html
	_site/jute-rug/index.html
	_site/lamp/index.html
	_site/mpd32/index.html
	_site/sofa/index.html
	_site/stool/index.html
	_site/studio-monitors/index.html
	_site/task-lamp/index.html
	_site/wool-rugs/index.html
removed _site folder
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
price drop
sold stuff
sold stuff
Merge branch 'gh-pages'