gitconfig and gitignore
Merge branch 'home'

Conflicts:
  .gitconfig