first commit
Merge https://github.com/mafunk/java