solve conflicts
Merge branch 'master' of https://github.com/viktorbaier/SupplyChain01.git
final project state