Commit by Stan
Merge branch 'master' of https://github.com/daynearron/Prevege

Conflicts:
	codekit-config.json