added conky
Merge branch 'master' of https://github.com/clashboom/dotfiles
add conky