merge
Merge branch 'master' of https://github.com/petermikitsh/SE441_Project2

Conflicts:
	TSA Airport/src/Airport/DocumentCheck.scala