Github -> GitHub, conky -> Conky
Merge pull request #24 from ZDroid/patch-1

Github -> GitHub, conky -> Conky