adding org-preamble
merging ylep commits
fix typo
Merge xgarrido's branch

Conflicts:
	slides/slide_heritage_1.org