Merge pull request #45 from ZooTypers/master

getting updates to do some slight changes
committing changes for music and such so that it turns off.
Merge pull request #46 from ZooTypers/master

getting updates
committing change in multiplayer model to fix bug that says opponent
disconnected when they didn't
Merge pull request #212 from nhlien93/master

fixing bug in multiplayer model saying opponent disconnected when they didn't
Fixing up some final tests.
Merge pull request #8 from ZooTypers/master

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

Pushing updates.
Merge pull request #47 from ZooTypers/master

getting updates
pushing changes of getting rid of logout method in options
Merge pull request #214 from nhlien93/master

pushing updates
Merge pull request #39 from ZooTypers/master

updating for codepro