Part 1,2 complete
Merge branch 'master' of https://github.com/al4k/coms10001-java