lo
Merge branch 'master' of https://github.com/mondoman712/dotfiles
Merge branch 'master' of https://github.com/mondoman712/dotfiles

Conflicts:
	.vimrc
ads
Merge branch 'master' of https://github.com/mondoman712/dotfiles

Conflicts:
	.Xresources
	.tmux.conf