error correction
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   prio100.scala
Merge ssh://github.com/boogleoodle/trafficometer