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

Conflicts:
	computer.science/languages/java/JavaExamples/src/com/java/examples/xml/plist/BrowserSettingsTest.java