-added conkyrc
Merge branch 'master' of github.com:rlyspn/DotFiles