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

jack/chris. history, favourites, read later.
implemented user caching
:wqMerge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
geo
Merge pull request #98 from diego04/master

geolocation part 1
fixed my questions null user problem
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/com/google/android/gms/R.java
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
Merge pull request #99 from 0nebit/master

user caching, removed hardcoded user, and fixed my questions null user problem
Added sound effects
solving some conflicts
fixing stuff :(
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/R.txt
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	OctoAskT12/project.properties
question id problem
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #100 from 0nebit/master

new question ID problem