Exercise 1 completed
Exercise 1
Merge remote-tracking branch 'sania5/master'

Conflicts:
	OOP344-Exercise1/Employee.cpp
	OOP344-Exercise1/Manager.h