back to xkbmap board
Merge branch 'master' of https://github.com/scoiatael/config

Conflicts:
	xmonad/startup.sh