stupid code kit stuff
Merge branch 'master' of github.com:racker80/CLG

Conflicts:
	app/js/controllers-ck.js
	app/js/services-ck.js