bib, intro
Merge branch 'master' into intro
'intro and bib started'
Merge branch 'master' of https://github.com/vsilv/fp
'volker and intro'