Merge pull request #29 from ZooTypers/master

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

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

getting updates
Merge pull request #37 from ZooTypers/master

getting updates before doing logging
Merge pull request #38 from ZooTypers/master

getting updated leaderboard
Merge pull request #27 from ZooTypers/master

update
Merge pull request #1 from ZooTypers/master

Getting most recent version.
Adding the waitForActivity in the LB and SP tests.
changed the multiplayer/singleplayer so that when leaving the game the
timer will be canceled so nothing continues running after leaving
activity.

Also added logs for options.
Merge pull request #39 from ZooTypers/master

getting updates
Merge pull request #188 from oaknguyen/master

fix lb
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.
committing changes...
Merge pull request #5 from ZooTypers/master

pull
committing options
Merge branch 'master' of https://github.com/ZooTypers/ZooTypers into zootypers

Conflicts:
	ZooTypers/src/com/example/zootypers/ui/Options.java
Merge pull request #191 from nhlien93/master

pushing up my changes to master