Update Codekit

Update code kit
Merge branch 'master' of https://github.com/efuste/csg_website

Conflicts:
	config.codekit