initial commit of transfer branch
added some debug to Server main
Merge branch 'transfer'

Conflicts:
	.gitignore
further changes to gitignore