Update test case
Merge branch 'images'

Conflicts:
	QuestionAppTests/src/ca/ualberta/cs/cmput301f14t14/questionapp/test/ImageTest.java