fixed path
kontiki chanages
Merge remote-tracking branch 'origin/master'

Conflicts:
	emacs
	zsh/oh-my-zsh
	zsh/zshenv