Apply local commits on top of remote changes by default.
Merge branch 'master' of https://github.com/mfalkus/dotfiles

Conflicts:
	.gitconfig