last try from 31.10
directory file
Merge branch 'master' of https://github.com/tikhoncheva/uni

Conflicts:
	.directory