sbt
Merge remote-tracking branch 'origin/master'

Conflicts:
	3-typed/.cache
	3-typed/src/main/scala/fos/SimplyTyped.scala