Added conky
Merge branch 'r4'