Compiles on my end, be sure to add test files in appropriate spot
Merge branch 'development' of https://github.com/M-Porter/IST412Project into development