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

Getting most recent version.
Fixing some more tests and MultiPlayer.
Merge pull request #4 from ZooTypers/master

Getting most recent version.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git

Conflicts:
	ZooTypers/tests/src/com/example/zootypers/test/MultiLeaderBoardModelTest.java
	ZooTypers/tests/src/com/example/zootypers/test/ScoreEntryTest.java
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git
Merge pull request #197 from dyxliang/master

Pushing updates.
Merge pull request #198 from cdallas/master

1 players disconnect is right
Merge pull request #5 from ZooTypers/master

Getting most recent version.
Updating the tests and taking out the old leaderboard code.
Merge pull request #199 from dyxliang/master

Pushing updates.
music default to no music
change
Merge pull request #7 from ZooTypers/master

sddd
Merge branch 'master' of https://github.com/fuskor/ZooTypers.git
Fixing up all the leaderboard tests.