Discovery completed
Merge branch 'master' of https://github.com/HWComputerScience/PlayPhone
Merge pull request #18 from TheSafo/master

Implemented Discovery and stuff