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

Conflicts:
	config.codekit
Merge branch 'master' into feature/player

Conflicts:
	build/less/style.less