Second commit - Progress 80%
Merge branch 'master' of https://github.com/tsili852/java.git
Finished - tray