fixed google play libraries
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
mergeing conflicts
merging
merging
merging
merging
merging
merging
Merge pull request #102 from aktse/master

merging