commit
3commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.tmux-powerline-status-left.sh
	.tmux-powerline-status-right.sh
	.tmux.conf
	.vimrc
	.zshrc