added the extra file for custom path and git config global
Merge branch 'master' into debian

* master:
  added the extra file for custom path and git config global

Conflicts:
	.extra