Updated with easier-to-read struct syntax; Using typedefs instead of DEFINE
Merge branch 'master' of github.com:SwimDude0614/CID

Conflicts:
	CID-globals.c
	CID-globals.h
	CID.c