Merge pull request #12 from ZooTypers/d66a9776c7bb5d92f362ed68a859b0d3d9b8fc29

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

Getting updates.
Update .classpath
Merge pull request #5 from ZooTypers/master

Getting updates.
finished some tests
Merge pull request #105 from oaknguyen/master

testing merge
Merge pull request #106 from cdallas/master

fix
Merge pull request #6 from ZooTypers/master

Getting updates.
Updating the .classpath
Updating test .classpath
Remove tests bin's AndroidManifest
Adding in changes to the existing tests.
Merge pull request #107 from dyxliang/master

Update
Adding timeouts for the single player test.
Merge pull request #108 from dyxliang/master

Pull
Merge pull request #19 from ZooTypers/master

updating