Implemented AddPictureAnswer (issue #33)
Merge branch 'master' of github.com:CMPUT301F14T05/CorgFu

Conflicts:
	App/src/ca/ualberta/cs/corgFuViews/ViewQuestionAndAnswers.java