trying to fix this
still trying to fix
...
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
searching implemented
Merge pull request #73 from aktse/master

searching implemented
fixing some errors
changed the upvote icon on the main questions
Merge pull request #74 from creativlimade/master

changed the upvote icon on the main questions
Changed background colours
Merge pull request #75 from creativlimade/master

Changed background colours
added couple of javadocs, made some other changes
connectivity
google play services reference
Merge pull request #76 from ibarreto/master

google play services and some javadoc
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/R.txt
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	OctoAskT12/src/cs/ualberta/octoaskt12/geol/version.java
misc files
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
implemented retracting upvote and back button press for detail view
Merge pull request #77 from aktse/master

implemented retracting uproot and back button