merge recent 5/11
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers.git
merged with fork
dg
5/13 multiplayer
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers

Conflicts:
	ZooTypers/bin/AndroidManifest.xml
w/ MiniTest