modify
Merge branch 'master' of github.com:kamatari/dotfiles

Conflicts:
	.zshrc
add pythonstartup