Merge pull request #4 from ZooTypers/master

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

Getting updates.
Merge pull request #18 from ZooTypers/master

update
Merge pull request #105 from oaknguyen/master

testing merge
fixed merge problems
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
Merge pull request #20 from ZooTypers/master

getting all the new files before i start working on it
Adding timeouts for the single player test.
Merge pull request #108 from dyxliang/master

Pull
Merge pull request #19 from ZooTypers/master

updating
fix build - include parse
Updating unit tests.
Merge pull request #109 from dyxliang/master

Pull