want to pull
resync with conflict resolved

Conflicts:
	QuizmTeach-master/QuizApp2/PastQuizViewController.m