sdf
README, cpp.orig
Merge remote-tracking branch 'origin/master' into student

Conflicts:
	LibraryInformationSystem/LibraryInformationSystem.sdf
sdf
Merge remote-tracking branch 'origin/student'

Conflicts:
	LibraryInformationSystem/LibraryInformationSystem.sdf