Addedd astreinte function
Merge branch 'master' of github.com:geektophe/zsh-config

Conflicts:
	zshrc