poked an equation

didn't make sense... at any rate, I'm pretty sure you want Math.min
instead. distance is already in meters - no need to consider cellSize.
Merge remote-tracking branch 'origin/master'

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