auto push_repos (12-25-14/15:28:42).
Merge branch 'master' of github.com:jfjhh/dotfiles

Conflicts:
	.bashrc