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

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
merging
fixing conflicts
implemented swipe down to refresh
Merge pull request #64 from aktse/master

Implemented swipe down to refresh