rebase
rebase
rebase
Merge branch 'laptop' of github.com:ncaq/.xmonad into laptop

Conflicts:
	.xmobarrc