git commit it!!
Merge branch 'master' of https://github.com/TomerAvni/clientsolution
edit it/

Conflicts:
	TestPushClientToGit/main.js