Merge pull request #20 from ZooTypers/master

merging with chels changes
multiplayer model now throws the correct exceptions when appropriate
Merge pull request #14 from ZooTypers/53177d69b8aa0627fe4d257bb7d003571f508915

update
s
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers

Conflicts:
	ZooTypers/src/com/example/zootypers/MultiPlayer.java
	ZooTypers/src/com/example/zootypers/SinglePlayerModel.java
"all I can do with testing"
Merge pull request #118 from oaknguyen/master

non connection test finished. Need to figure out how to test connection stuff.
Merge pull request #9 from ZooTypers/master

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

getting all new changes
adding changes
Merge pull request #21 from nhlien93/master

getting lindseys changes
Working on testing the multiplayer model and view.
committing multiplayer test
fixing error screens
Merge pull request #119 from dyxliang/master

Pull update.
error screens now show up accordingly, timer now runs from 59-0 and app
icon now no longer looks like a keyboard!
Merge pull request #121 from winglam/master

error screens now show up, timer runs from 59-0 & app icon is no longer a keyboard!
Merge pull request #5 from ZooTypers/master

pull