test branch
test master '1'
test branch '2'
Merge branch 'pyLANTransfer_v1.0.0'

Conflicts:
	src/socket_server.py