Stray files.
Merge branch 'master' of sjsu:cs160-q06/siquoia

Conflicts:
	03-Detailed-Requirements/flowcharts/quiz.dia