convenience :q shortcut for exiting zsh
Merge remote-tracking branch 'origin/master'