commit
Merge branch 'master' of https://github.com/reklawCOTF/Restaurant-Project

Conflicts:
	UserInterface.cpp
	bin/Debug/RestaurantSystem.exe
	obj/Debug/UserInterface.o