o
Merge branch 'master' of https://github.com/GregorStocks/configs

Conflicts:
	.zshrc