Blörg
Merge branch 'master' of github.com:Grulfen/Config

Conflicts:
	zshrc