project stuff
Merge branch 'master' of github.com:mvoelske/coursera-functional-scala

Conflicts:
	lecture/.settings/org.scala-ide.sdt.core.prefs