add somthing
Merge branch 'master' of https://github.com/nathanyan/java_allinone

Conflicts:
	concurrency/src/main/java/yl/codecraft/concurrency/threadlocal/DataFormatWithThreadLocal.java
Merge remote-tracking branch 'origin/master'