More rewriting, shortening
Merge branch 'master' of github.com:VladUreche/mbox-scala-workshop

Conflicts:
	src/collections.tex