final terminator
Merge branch 'master' of https://github.com/FinalSpark/CS343Final

Conflicts:
	a6/q1office.cc