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

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
edited the question activity layout
merging
Image can be taken when making a question.
added drawable attribute to question class
deleted annoying toast inside listener
Merge branch 'imageFeature'
fixed issue in Question class that was causing app to crash.
now you can add image to the question.
Merge pull request #58 from nkparikh/master

you can add image when creating a question.
ES working but no support for image yet
ES working but no support for image, but will be implemented soon
Merge pull request #59 from diego04/master

ES succeeded some test run, new Image Functionality not tested yet.
implementing upvotes. Looks promising...
upvote question is working good
upvote answer is working good
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 #60 from ibarreto/master

implemented upvote answer and question
Adding an image works. Now the image is actually added to the question object and displayed