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

Conflicts:
	computer.science/languages/java/network/PushServerTest/src/com/pekall/push/test/ConnectionTest.java