Merge pull request #29 from ZooTypers/master

updating james's changes
Merge pull request #30 from ZooTypers/master

updating for victoria
Merge pull request #1 from ZooTypers/master

Getting most recent version.
Adding the waitForActivity in the LB and SP tests.
Merge pull request #2 from ZooTypers/master

Getting most recent version.
Adding the sound and vibration options for Bryan.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git
Updating multiplayer.
Merge pull request #191 from nhlien93/master

pushing up my changes to master
Fixing up some tests and also the sound/vibrate options.
adding website to github
Merge pull request #192 from winglam/master

adding website
Merge branch 'master' of https://github.com/ZooTypers/ZooTypers

Conflicts:
	ZooTypers/src/com/example/zootypers/ui/MultiPlayer.java
	ZooTypers/src/com/example/zootypers/ui/Options.java
Merge pull request #193 from dyxliang/master

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

getting updates with sound/vibration options