Merge branch 'master' of https://github.com/demophoon/dotfiles into zsh_update
Merge branch 'master' of https://github.com/demophoon/dotfiles into zsh_update
Merge branch 'zsh_update' of https://github.com/demophoon/dotfiles into zsh_update
Update script modified to update current branch.

No more unnecessary master > current_branch merge commits!
Merge remote-tracking branch 'origin' into zsh_update
Merge remote-tracking branch 'origin/zsh_update' into zsh_update