Initial commit for Cid
Merge branch 'master' of https://github.com/jgimbel/shell

Conflicts:
	shell.pro.user
Makefile.
Cool stuff
	deleted:    Makefile