part a + b. java project
Merge branch 'master' of https://github.com/dlieldx/javaProject