Added conky
Merge branch 'add-conky'