Merge branch 'master' of github.com:storm-enroute/scalameter link

axel22 authored to master