Added clarification comment to COntrol.h
Changed around some defines to eliminate redundancy
Merge branch 'master' of https://github.com/JohnPayment/Project