better battery
Merge branch 'master' of github.com:twist/rc_lib

Conflicts:
	rc/i3/config
i3 and conky
Merge branch 'master' of github.com:twist/rc_lib

Conflicts:
	rc/i3/config
	rc/i3/conkyrc
Merge branch 'master' of github.com:twist/rc_lib
        cmus control