sending of data now works
got server working
Merge branch 'client-server'
merging working client server with master