Merge pull request #10 from ZooTypers/master

Getting updates.
Merge pull request #15 from ZooTypers/master

update
Merge pull request #22 from ZooTypers/master

getting david's test changes
finish comments
finish comments2
Merge pull request #16 from ZooTypers/master

update me
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers
Merge pull request #11 from oaknguyen/master

Getting updates for the testing comments.
Adding in the instrumentation for the Main Project Manifest and adding
more multiplayer tests.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git
Merge pull request #126 from littlpunk/master

push
Merge pull request #23 from ZooTypers/master

getting new updates.
Finishing up all the tests and commenting them.
Merge pull request #12 from ZooTypers/master

Getting updates.
Merge pull request #128 from dyxliang/master

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

getting updates so that i can comment the code
Merge pull request #23 from ZooTypers/master

merging for commit
completed refactor and switched to one database
Merge branch 'master' of https://github.com/winglam/ZooTypers-1.git

Conflicts:
	ZooTypers/.classpath
	ZooTypers/AndroidManifest.xml
	ZooTypers/src/com/example/zootypers/ConnectionError.java
	ZooTypers/src/com/example/zootypers/EmptyQueueException.java
	ZooTypers/src/com/example/zootypers/InternalErrorException.java
	ZooTypers/src/com/example/zootypers/InternetConnectionException.java
	ZooTypers/src/com/example/zootypers/InterruptError.java
	ZooTypers/src/com/example/zootypers/LeaderBoardModel.java
	ZooTypers/src/com/example/zootypers/Leaderboard.java
	ZooTypers/src/com/example/zootypers/MultiPlayer.java
	ZooTypers/src/com/example/zootypers/MultiPlayerModel.java
	ZooTypers/src/com/example/zootypers/NoOpponentError.java
	ZooTypers/src/com/example/zootypers/PostGameScreen.java
	ZooTypers/src/com/example/zootypers/PostGameScreenMulti.java
	ZooTypers/src/com/example/zootypers/PreGameSelectionMulti.java
	ZooTypers/src/com/example/zootypers/RegisterPage.java
	ZooTypers/src/com/example/zootypers/ScoreEntry.java
	ZooTypers/src/com/example/zootypers/SinglePlayer.java
	ZooTypers/src/com/example/zootypers/SinglePlayerModel.java
	ZooTypers/src/com/example/zootypers/States.java
	ZooTypers/src/com/example/zootypers/TitlePage.java
Merge pull request #129 from winglam/master

completed refactor and switched to one database