Lolcats ftw
Update conkyrc a bit
Fix merge conflict
Fix Conkyrc
Add conkyrc to gitignore
Replace old keys