reset attempt
Merge branch 'master' of https://github.com/ray13z/conky

testing stuff out
sort of initial commit