added some icons to i3bar and conky
Merge branch 'master' of https://github.com/smlb/dotfiles