Merged the bin folder from master.
Merged the conkyrc from master branch.