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