Merge pull request #1 from ZooTypers/master

cd
Merge pull request #2 from ZooTypers/master

123
Merge pull request #3 from ZooTypers/master

c
Merge pull request #4 from ZooTypers/master

sdsd
Merge pull request #5 from ZooTypers/master

sdsd
Merge pull request #6 from ZooTypers/master

koko
Merge pull request #201 from fuskor/master

music default to no music