fixed???? cross-net tom
New update, 825
Merge remote-tracking branch 'origin/fixedTOM'

Conflicts:
	NetworkCalculator/src/networkCalcPackage/NetworkCalculator.java
	NetworkCalculator/src/networkCalcPackage/Operations.java