Дабавление ключей
Merge branch 'master' of https://github.com/smike3/conky_w

Conflicts:
	.anjuta/session/anjuta.session