java project for cs56 -- just in case I screw up the merge