pulling
Merge branch 'master' of https://github.com/susanliu90/group17

Conflicts:
	quizmaker/php/displayTAs.php
push
pushing
Merge branch 'master' of https://github.com/susanliu90/group17

Conflicts:
	quizmaker/php/displayTAs.php