Tea timer method
Merge branch 'master' of github.com:alanzoppa/dotfiles

Conflicts:
	.zshrc