redundant coding...
Merge branch 'master' of https://github.com/ravench/config

Conflicts:
	herbstluftwm/panel2.sh
repaired things