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 #31 from ZooTypers/master

updating for logging
Merge pull request #32 from ZooTypers/master

updating for logging
Merge pull request #33 from ZooTypers/master

updating for song
music default to no music
change
Merge pull request #7 from ZooTypers/master

sddd
Merge branch 'master' of https://github.com/fuskor/ZooTypers.git
Merge pull request #6 from ZooTypers/master

koko
Merge pull request #201 from fuskor/master

music default to no music
Merge pull request #34 from ZooTypers/master

updating for loggng
Merge pull request #202 from fuskor/master

sdsdsd
Finished commenting on all of the tests.
Merge pull request #6 from ZooTypers/master

Getting most recent version.
Merge pull request #203 from dyxliang/master

Pushing updates.
Fixing up the music errors.