.
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
Chuan/Chris/Kevin -  Added local offline questions handler and related tests.
Merge pull request #25 from 0nebit/master

Offline local my-questions handler.
Implemented all sorting functions
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
Merge pull request #26 from aktse/master

Implemented all sorting functions
Completed test cases for sorting functions
Merge pull request #27 from aktse/master

Completed test cases for sorting functions
Modified my questions data handler tests.
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12TestsTest/bin/OctoAskT12Tests.apk
	OctoAskT12TestsTest/bin/classes.dex
Merge pull request #28 from 0nebit/master

Fixed merge problem.
this is bad stuff
more bad stuff
fixed merge conflicts. Everything working now