Handling .gitconfig
Merge branch 'master' of http://github.com/asterkin/chol

changes from two user accounts