first commit
Merge branch 'master' of https://github.com/shinigami7/CompanyManager

Conflicts:
	src/Company Manager.cpp
	src/Company.cpp
	src/Company.h
	src/Employee.cpp
	src/Employee.h
	src/Executive.cpp
	src/Executive.h
	src/HourlyEmployee.cpp
	src/HourlyEmployee.h