pull and push, oh my
Merge branch 'master' of github.com:coledot/dotfiles

Conflicts:
	.bashrc