Merge pull request #13 from CSUChicoSoftwareEngineering/d_branch

Added tests to main branch