Merged Projects, Fixed Numerous Bugs. 8 Testcases

Completes P4 except for need a few more test cases. All requirements
fully working and code commented