interface
Merge branch 'master' of https://github.com/maxmamis/mcconnelling

Conflicts:
	config.codekit