Added conkyrc
Added autostart file
Merge branch 'conky'