.
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.