2 is gone
git wq
Merge branch 'master' of github.com:michaeltingley/CS175