git email
irbrc
editorconfig
path
Merge branch 'brainspoon'

Conflicts:
	zshrc
no .sh files
merge tendril