no pa on servy
Merge branch 'master' of https://github.com/FruitieX/dotfiles

Conflicts:
	.xinitrc