update lock application
change .conkyrc
Merge branch 'master' of github.com:alemedeiros/dotfiles