Creating a new file_1
updated the file
POS-1212: committing file_2 by user1
Merge branch 'develop' of https://github.com/ramaraoyerramsetti/shopping-cart into develop
POS-1212 : updated file_2 by user2.
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
POS-1212: Changes for simple feature.
POS-1212: Document changes for release