test conflict
Merge branch 'master' of https://github.com/SebastianPatane/ZindigoAmbassadorCentral

Conflicts:
	README.md
Fix for Anuj side conflict