Added distanceFunction enum to clustering
Merge branch 'master' of github.com:ntnu-smartmedia/goldfish

# By Dag Einar Monsen
# Via Dag Einar Monsen
* 'master' of github.com:ntnu-smartmedia/goldfish:
  Refactor Columns
  Include average when calcuating ResultList.total and average
  Fix evalTime to include average

Conflicts:
	src/edu/ntnu/idi/goldfish/Main.java