Removed superfluous whitespace.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/watch/Watcher.scala
Removed superfluous whitespace.