1st commit
Merge branch 'master' of github.com:daniel-shamaeli/market-devops

Conflicts:
	README.md