Update
Merge branch 'master' of https://github.com/thall/Xmonad-config

Conflicts:
	xmonad.hs