updating
Merge branch 'master' of https://github.com/luckymark/CppExamples

Conflicts:
	ComputerSales_oo/include/EnterWareHouse.h
	ComputerSales_oo/src/WareHouse.cpp