Removed the ca_testing folder and the logger.
Removed ca_testing folder...
Conflict resolution.
Merge branch 'master' of https://github.com/bmwinstead/enigma-project.git