merge conflicts
Merge pull request #30 from 0nebit/master

Added network checker.
merge conflicts
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #31 from aktse/master

merge conflicts
added some comment/reply stuff
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Fixed my questions data handler tests.
Merge pull request #32 from ibarreto/master

added reply classes
adding answer works again
everything appears to be working now :)
Merge pull request #33 from ibarreto/master

stuff is working
setting up fragments for loading
Merge pull request #34 from diego04/master

setting up fragments for loading
first commit elasticsearch
Merge pull request #35 from diego04/master

first commit elasticsearch
Chris/Chuan, added history cache and test
Merge pull request #39 from creativlimade/master

Chris/Chuan, added history cache and test
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12TestsTest/src/cs/ualberta/octoaskt12/test/MyQuestionsCacheManagerTest.java
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

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