Add 'gp' alias for git fetch / git merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bash_aliases