s
Merge branch 'master' of https://github.com/redwhitemike/Project-FYS

Conflicts:
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$1.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$10.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$11.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$12.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$13.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$14.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$2.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$3.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$4.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$5.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$6.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$7.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$8.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser$9.class
	Afhandelingssysteem/build/classes/view/desk/FindLuggageUser.class
	Afhandelingssysteem/nbproject/private/private.xml
no message
no message
Merge branch 'master' of https://github.com/redwhitemike/Project-FYS

Conflicts:
	Afhandelingssysteem/nbproject/private/private.properties
	Afhandelingssysteem/src/view/desk/FindLuggageUser.form
	Afhandelingssysteem/src/view/desk/FindLuggageUser.java