Fixed adhoc_setup for peter
Merge conflicts
Changed IP
Renamed old Server and Client classes and interfaces to Listener and Sender respectively.
Changed ip again
Merge branch 'peter'