second commit
This is a merge message.

Merge branch 'master' of https://github.com/chopin1926/java