new file:   home/.Xdefaults
	new file:   home/.tmux.conf
	new file:   home/.vim/.netrwhist
	new file:   home/.vim/after/ftplugin/haskell.vim
	new file:   home/.vim/after/ftplugin/ruby.vim
	new file:   home/.vim/after/ftplugin/vim.vim
	new file:   home/.vim/after/ftplugin/zsh.vim
	new file:   home/.vim/swap/.swp
	new file:   home/.vim/swap/arg.c.swp
	new file:   home/.vim/swap/report.swp
	new file:   home/.vimperatorrc
	new file:   home/.vimrc
	new file:   home/.xmobarrc
	new file:   home/.xmonad/xmonad-arm-linux
	new file:   home/.xmonad/xmonad-x86_64-linux
	new file:   home/.xmonad/xmonad.errors
	new file:   home/.xmonad/xmonad.hi
	new file:   home/.xmonad/xmonad.hs
	new file:   home/.xmonad/xmonad.o
	new file:   home/.zsh/auto-fu.zsh
	new file:   home/.zsh/history
	new file:   home/.zshrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	home/.zshrc

	modified:   home/.zshrc