Fix average format causing bug
Fix columns
Merge branch 'master' of github.com:ntnu-smartmedia/goldfish

# By Patrick Heia Romstad
# Via Patrick Heia Romstad
* 'master' of github.com:ntnu-smartmedia/goldfish:
  Added distFunc in Columns
  Changes from three cols to one col in clustering