Merge pull request #115 from dyxliang/master

Pull
Merge pull request #116 from dyxliang/master

Pull
Merge pull request #117 from dyxliang/master

Pull
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.