Updatean 2
Merge branch 'master' of https://github.com/faitz/FaiSimpleJavaSocket

Conflicts:
	README.md

merge