add server
Merge branch 'master' of github.com:derooy/dotfiles

Conflicts:
	templates/zshrc