Updated .gitconfig, added github username
Merge branch 'master' of https://github.com/zajd/dotfiles