Stash
Merge branch 'master' of github.com:CruWeb/patterns

Conflicts:
	config.codekit