fixing parse stuff for fitb
Merge remote-tracking branch 'origin/master'

Conflicts:
	FinalProject/app/src/main/java/com/chaotichippos/finalproject/app/model/FillInTheBlankQuestion.java