Final changes.
Merge branch 'master' of https://github.com/mike-n-7/COMP598Project2