testing commit
Merge branch 'master' of https://github.com/ranafde/Virtual-Receipt
test
Conflicts:
	VirtualReceipt/.gitignore
	VirtualReceipt/project.properties