Merge pull request #2 from CO600GOL/develop

Merge CO600 develop into mine.
Added a test command in the Makefile. Paired by Michael and Richard

Should make testing easier and doesn't require you to be in src/testing; like the src/testing/__init__.py script requires
Merge pull request #14 from richlanc/develop

Merge testing changes into CO600 develop