Changed stuff
Merge branch 'master' of https://github.com/dunz0r/configs

Conflicts:
	.dwm/config.h
	.xinitrc