Merge
Merge branch 'master' of https://github.com/DanielVoogsgerd/Environment into HEAD

Conflicts:
	zsh/zshrc
Merge fix
Merge branch 'master' of https://github.com/DanielVoogsgerd/Environment into HEAD
i3 config
i3 config
Merge branch 'master' of https://github.com/DanielVoogsgerd/Environment into dev_sibren

Conflicts:
	i3/config
Removed whitespace
Merge remote-tracking branch 'origin/dev_sibren'

Conflicts:
	i3/config