update
Merge branch 'master' of https://github.com/jazzlly/Notes

Conflicts:
	java/JavaExamples/.idea/libraries/lib2.xml
	java/JavaExamples/.idea/misc.xml
	java/JavaExamples/.idea/workspace.xml