Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/scala/s_mach/string/StringOps.scala
	src/main/scala/s_mach/string/WordSplitter.scala
	work.log
	work.log~