update
Merge branch 'master' of github.com:SaberFans/OCPJP7
concurrent collection, and NoSuchElement Exception not terminating the program