updated
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01