Requirements type question
Conflict Question and Answer
fixing conflicts
Merge https://github.com/burrise/CS451QandA
Merge https://github.com/burrise/CS451QandA

Conflicts:
	Exam1QandA.txt
Merge pull request #10 from johnmdonich/master

John Donich Test Questions