Ignore files in .xmonad other than xmonad.hs
Merge branch 'master' of github.com:NigoroJr/dotfiles

Conflicts:
	.xmonad/xmonad.errors
	.xmonad/xmonad.o