Completed Assignment

Fixed bugs throughout the code.  Created JUnit test cases.