change
Merge branch 'master' of https://github.com/bakoenig/config
Merge branch 'master' of https://github.com/bakoenig/config

Conflicts:
	.config/awesome/rc.lua
	README.md
new cpuwidget
Merge branch 'master' of https://github.com/bakoenig/config
Merge branch 'master' of https://github.com/bakoenig/config

Conflicts:
	.config/openbox/rc.xml
	.vimrc
changes