git commit changes
Merge branch 'master' of https://github.com/TomerAvni/clientsolution

Conflicts:
	TestPushClientToGit/main.js