this is priyankas first change
Merge branch 'master' of https://github.com/PriyankaJaganathan/kitchenstore
conflicts resolved
Conflicts:
	fileA.java