small addition
Merge branch 'master' of github.com:proycon/folia

Conflicts:
	docs/folia_paper.tex