Progress on server connections
Merge branch 'master' of github.com:pennomi/touche

Conflicts:
	main.py