part  C
Merge https://github.com/dlieldx/javaProject