Merge "Implementing class to play tones" into nyc-dev
am: a37612a50a

* commit 'a37612a50a30eace3f6d8faeaf6a35bc58f6bfbb':
  Implementing class to play tones