config codekit
Merge branch 'master' of https://github.com/VincentRicard/ArtViatic-static

Conflicts:
	config.codekit