Re-compile with jekyll
ignore and config
Removing _site/ temporarily
Cleanup
Organizing
Organization
Merge branch 'refs/heads/gh-pages' into dev

Conflicts:
	_site/config.codekit
	_site/index.html
	_site/pages/article.html
	_site/patterns/abbr.html
	_site/patterns/address.html
	_site/patterns/audio.html
	_site/patterns/blockquote.html
	_site/patterns/bold.html
	_site/patterns/btn-disabled.html
	_site/patterns/btn-large.html
	_site/patterns/btn-primary.html
	_site/patterns/btn-secondary.html
	_site/patterns/btn-small.html
	_site/patterns/btn-subtle.html
	_site/patterns/cite.html
	_site/patterns/del.html
	_site/patterns/details.html
	_site/patterns/dfn.html
	_site/patterns/dl-dfn.html
	_site/patterns/element-buttons.html
	_site/patterns/element-text.html
	_site/patterns/em.html
	_site/patterns/feedback-error.html
	_site/patterns/feedback.html
	_site/patterns/figure-blockquote.html
	_site/patterns/figure-img.html
	_site/patterns/figure-list.html
	_site/patterns/form-buttons.html
	_site/patterns/form-checkbox.html
	_site/patterns/form-fieldset.html
	_site/patterns/form-input-email.html
	_site/patterns/form-input-password.html
	_site/patterns/form-input-text-disabled.html
	_site/patterns/form-input-text-help.html
	_site/patterns/form-input-text.html
	_site/patterns/form-input-url.html
	_site/patterns/form-number.html
	_site/patterns/form-options-checkbox.html
	_site/patterns/form-options-checkboxes.html
	_site/patterns/form-options-radios-captions.html
	_site/patterns/form-options-radios.html
	_site/patterns/form-select-disabled.html
	_site/patterns/form-select-multiple-disabled.html
	_site/patterns/form-select-multiple.html
	_site/patterns/form-select.html
	_site/patterns/form-signup.html
	_site/patterns/form-spoken.html
	_site/patterns/form-text.html
	_site/patterns/form-textarea-disabled.html
	_site/patterns/form-textarea.html
	_site/patterns/form-url.html
	_site/patterns/from-input-checkbox.html
	_site/patterns/heading-1.html
	_site/patterns/heading-2.html
	_site/patterns/heading-3.html
	_site/patterns/heading-4.html
	_site/patterns/heading-5.html
	_site/patterns/heading-6.html
	_site/patterns/hr.html
	_site/patterns/img.html
	_site/patterns/link-external.html
	_site/patterns/link.html
	_site/patterns/list-ordered.html
	_site/patterns/list-unordered-numbered.html
	_site/patterns/list-unordered.html
	_site/patterns/pagination-first.html
	_site/patterns/pagination-last.html
	_site/patterns/pagination.html
	_site/patterns/paragraph.html
	_site/patterns/small.html
	_site/patterns/strong.html
	_site/patterns/tables.html
	_site/patterns/time.html
	_site/patterns/video.html
	config.codekit
Compiling jekyll
Compiling
Merge remote-tracking branch 'origin/dev'

Conflicts:
	_site/config.codekit
	_site/index.html
	_site/pages/article.html
	_site/patterns/abbr.html
	_site/patterns/address.html
	_site/patterns/audio.html
	_site/patterns/blockquote.html
	_site/patterns/bold.html
	_site/patterns/btn-disabled.html
	_site/patterns/btn-large.html
	_site/patterns/btn-primary.html
	_site/patterns/btn-secondary.html
	_site/patterns/btn-small.html
	_site/patterns/btn-subtle.html
	_site/patterns/cite.html
	_site/patterns/del.html
	_site/patterns/details.html
	_site/patterns/dfn.html
	_site/patterns/dl-dfn.html
	_site/patterns/element-buttons.html
	_site/patterns/element-text.html
	_site/patterns/em.html
	_site/patterns/feedback-error.html
	_site/patterns/feedback.html
	_site/patterns/figure-blockquote.html
	_site/patterns/figure-img.html
	_site/patterns/figure-list.html
	_site/patterns/form-buttons.html
	_site/patterns/form-checkbox.html
	_site/patterns/form-fieldset.html
	_site/patterns/form-input-email.html
	_site/patterns/form-input-password.html
	_site/patterns/form-input-text-disabled.html
	_site/patterns/form-input-text-help.html
	_site/patterns/form-input-text.html
	_site/patterns/form-input-url.html
	_site/patterns/form-number.html
	_site/patterns/form-options-checkbox.html
	_site/patterns/form-options-checkboxes.html
	_site/patterns/form-options-radios-captions.html
	_site/patterns/form-options-radios.html
	_site/patterns/form-select-disabled.html
	_site/patterns/form-select-multiple-disabled.html
	_site/patterns/form-select-multiple.html
	_site/patterns/form-select.html
	_site/patterns/form-signup.html
	_site/patterns/form-spoken.html
	_site/patterns/form-text.html
	_site/patterns/form-textarea-disabled.html
	_site/patterns/form-textarea.html
	_site/patterns/form-url.html
	_site/patterns/from-input-checkbox.html
	_site/patterns/heading-1.html
	_site/patterns/heading-2.html
	_site/patterns/heading-3.html
	_site/patterns/heading-4.html
	_site/patterns/heading-5.html
	_site/patterns/heading-6.html
	_site/patterns/hr.html
	_site/patterns/img.html
	_site/patterns/link-external.html
	_site/patterns/link.html
	_site/patterns/list-ordered.html
	_site/patterns/list-unordered-numbered.html
	_site/patterns/list-unordered.html
	_site/patterns/pagination-first.html
	_site/patterns/pagination-last.html
	_site/patterns/pagination.html
	_site/patterns/paragraph.html
	_site/patterns/small.html
	_site/patterns/strong.html
	_site/patterns/tables.html
	_site/patterns/time.html
	_site/patterns/video.html
	config.codekit