test
added gitconf
Merge branch 'master' of https://github.com/mheider/dotfiles