merge
Merge branch 'master' of github.com:CruWeb/patterns into dev

Conflicts:
	.gitignore
	_site/config.codekit
	config.codekit
configs
updating submodule
Ignoring _site
submodule
Updating
Changing up formatting
Saving
slider
Merge branch 'refs/heads/dev' into gh-pages

Conflicts:
	.gitignore
	_site/blocks/articles/demo1/index.html
	_site/blocks/articles/demo2/index.html
	_site/index.html
	_site/patterns/blockquote.html
	_site/patterns/element-text.html
	_site/style.min.css
	_styles/.sass-cache/aece822552ac7057ad8422d81adbcb348f8dd133/_article.scssc
	_styles/.sass-cache/aece822552ac7057ad8422d81adbcb348f8dd133/_footer.scssc
	blocks/articles/demo2/index.html
	config.codekit
	style.min.css
Demos