asd
Merge branch 'master' of https://github.com/Kiachma/Dotfiles

Conflicts:
	herbstluftwm/autostart
Merge branch 'master' of https://github.com/Kiachma/Dotfiles
Merge branch 'master' of https://github.com/Kiachma/Dotfiles
Merge branch 'master' of https://github.com/Kiachma/Dotfiles
Merge branch 'master' of https://github.com/Kiachma/Dotfiles
Merge branch 'master' of https://github.com/Kiachma/Dotfiles
update'