a
Merge branch 'master' of github.com:fahad623/KG_tradeshift

Conflicts:
	code/VSProj-Tradeshift/VSProj-Tradeshift.pyproj
	code/VSProj-Tradeshift/VSProj-Tradeshift.v12.suo
a
a