Merge pull request #1 from maseek/master

class diagram, toggle sound
Merge pull request #2 from maseek/GP3-Submission

Merge pull request #1 from maseek/master