Remove ex-employees
Add Kris to git-pair config
`resolve` alias for git conflicts
Merge pull request #8 from neo/resolve_alias

Resolve alias