modified:   features.scala
wMerge ssh://github.com/boogleoodle/trafficometer

Conflicts:
	docs/krav/features.scala
Merge ssh://github.com/boogleoodle/trafficometer