change default merge tool to kaleidoskope + add gitignore file
add theos variable
change default merge tool to kaleidoskope + add gitignore file
Merge branch 'master' into HEAD

Conflicts:
	zshrc
Merge branch 'st'