various test cases
Merge branch 'MajorRefactor' of github.com:kjplatz/CS6380Project1 into MajorRefactor