Fix to the scaling fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Term Project/src/algorithm/DiscreteCostAnalysis.java