Working on wrk function
Merge branch 'master' into feature-wrk-ordbogen

Conflicts:
	fish/functions/wrk.fish
Merge branch 'feature-wrk-ordbogen'
Merge branch 'master' of github.com:homburg/settings