Added git merge/diff tool
Merge branch 'master' of github.com:zchen24/config