Changed 'ls' alias
Merge branch 'master' of github.com:AmazingDreams/dotfiles
Fixed conky images offset