def mr server
Merge branch 'master' of https://github.com/discobot/dotfiles

Conflicts:
	zshrc
cpplint