Final commit java1 wk3 term 1312