added assignment 5
some changes
erge branch 'master' of https://github.com/strandx/java

 especially if it merges an updated upstream into a topic branch.