changed || to && to fix conditional
Merge remote-tracking branch 'origin/TestBranch' into TestBranch

Conflicts:
	Astar/src/AstarNetwork/ExchangeIO.java