test
Added .bashrc, edited make.conf
Added .conkyrc
added conkyrc