Latest changes... merged unitTest too.
commit gosh darn you
Merge branch 'master' of https://github.com/Lduperron/CSCI375-Team-Project