Git pager updated
New zsh theme
Merge changes
Merged now?
Merge remote-tracking branch 'origin/master'

Conflicts:
	gitconfig