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
Merge branch 'master' of github.com:CruWeb/patterns into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.