Updated configuration files.
Merge branch 'master' of https://github.com/Virtual-/Config

Conflicts:
	.xinitrc