POS-1212: updating file_2 by user1.
POS-1212:Merge branch 'develop' of https://github.com/ramaraoyerramsetti/shopping-cart into develop

Conflicts:
	file_2.txt