config
Ignore changes
ignores
Merge branch 'master' of github.com:CruWeb/patterns

Conflicts:
	.gitignore
	config.codekit
Delete files that weren't supposed to be in git