Merge pull request #4 from itcc-li/sprint2

all merged together
Merge pull request #5 from itcc-li/sprint2

Sprint2
Merge pull request #6 from itcc-li/sprint2

Sprint2
sounds files added
Merge pull request #36 from simonmeier/sprint2

Sprint2