gantt file
Merge pull request #22 from 0nebit/master

Chuan/Chris - added tests for searching questions and answers.
added test user stort 23
updated gantt charts
Merge pull request #23 from aktse/master

Added gantt chart
added some future test cases
added some future test cases
Merge pull request #24 from diego04/master

Added some future test cases
.
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_