more work
Merge remote-tracking branch 'origin/master'

Conflicts:
	scalajs/src/main/scala/example/SetJS.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	scalajs/src/main/scala/example/SetJS.scala