update
Merge branch 'master' of github.com:neeee/dotfiles

Conflicts:
	config/awesome/rc.lua
	config/awesome/themes/ttt/theme.lua
Merge branch 'master' of github.com:neeee/dotfiles