commit by VK for testing of merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	SalesRepoProject/src/com/demo/test/Demo.java