Finished Java Assignment 2