Merge pull request #12 from ZooTypers/d66a9776c7bb5d92f362ed68a859b0d3d9b8fc29

recent merging
finsihed testing
Merge pull request #17 from ZooTypers/master

update
new game from multi player & ui
modified login/register UI
loading screen start
loading popup
did some rearanging of methods as well as some comments
Merge pull request #101 from winglam/master

fixing multiplayer.java merge problems
trying to merge one more time
Merge pull request #103 from nhlien93/master

trying to merge with master
okay.. one last time. this should be it.
Merge pull request #104 from nhlien93/master

model was broken. this should fix it.
Merge branch 'master' of https://github.com/cdallas/ZooTypers into cdallas-master

Conflicts:
	ZooTypers/src/com/example/zootypers/MultiPlayer.java

Merge MultiPlayer
Merge https://github.com/ZooTypers/ZooTypers

merging

Conflicts:
	ZooTypers/src/com/example/zootypers/MultiPlayer.java
	ZooTypers/src/com/example/zootypers/PostGameScreenMulti.java
Merge pull request #18 from ZooTypers/master

update
finished some tests
Merge pull request #105 from oaknguyen/master

testing merge
fixed merge problems
Merge pull request #106 from cdallas/master

fix