gnome-shell adjustment
Merge branch 'master' of github.com:shaerdi/conky

Conflicts:
	conkyrc