init
	modified:   .gitconfig
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.bashrc
	.gitconfig
	.vimrc