Codekit Config
Merge branch 'master' of github.com:kentonquatman/boilerplate

Conflicts:
	config.codekit