updates
Merge branch 'master' of https://github.com/guyroyse/java-class-code