androidquery/androidquery — pull request #102 by atimothee (2014-08-04 05:52:01+00:00)
Title: removed conflict markers in readme

cleaned up the read me of conflict markers