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

Conflicts:
	computer.science/algorithms/index.txt
	computer.science/languages/java/xml/PlistParser/PlistParser.jar
	computer.science/languages/java/xml/PlistParser/test/com/pekall/plist/WjlBuildDefaultPolicy.java