Receipt viewer imp
conflict resMerge branch 'master' of https://github.com/yuanzhi-umd/receipt_master

Conflicts:
	AndroidStudioProjects/ReceiptViewer/ReceiptViewer.iml