conky settings
Merge branch 'master' of github.com:OliverUv/Configuration-files