second commit
Merge branch 'master' of https://github.com/mr-jojo8/JavaProblem.git