update for git
Merge remote-tracking branch 'origin/master'

Conflicts:
	configEnviroument/README.md