Merge branch 'func13'

Conflicts:
	f1
Merge branch 'master' of https://www.github.com/DPLaura/DPL