configs
Merge branch 'master' of github.com:thejamesdempsey/orange-county-library-redesign

Conflicts:
	_site/config.codekit
	config.codekit
Merge remote-tracking branch 'origin/setup'

Conflicts:
	_site/config.codekit
Configs
gitignore
ignore
configs
removed codekit config
Merge branch 'refs/heads/master' into setup

Conflicts:
	.gitignore