first commit
Merge https://github.com/justin-yip/Java