Merge pull request #8 from ZooTypers/master

r
merge recent 5/11
Merge pull request #9 from ZooTypers/master

d
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers.git
merged with fork
Merge pull request #10 from ZooTypers/master

l
dg
5/13 multiplayer
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers

Conflicts:
	ZooTypers/bin/AndroidManifest.xml
w/ MiniTest
Merge pull request #64 from oaknguyen/master

Basics of UI Testing for SinglePlayer
Merge pull request #11 from ZooTypers/master

sdf
robotium
Merge pull request #65 from oaknguyen/master

Robotium&Javadoc
Merge branch 'master' of https://github.com/ZooTypers/ZooTypers into
ZooTypers-master

Conflicts:
	ZooTypers/.classpath