soft link
Merge branch 'master' into tmp2

Conflicts:
	configuration.nix