First commit
Merge branch 'master' of https://github.com/yuanzhi-umd/receipt_master

Conflicts:
	AndroidStudioProjects/ReceiptViewer/.idea/misc.xml
	AndroidStudioProjects/ReceiptViewer/app/src/main/AndroidManifest.xml
	AndroidStudioProjects/ReceiptViewer/app/src/main/java/com/bootcamp/receipt/receiptviewer/MainActivity.java
	AndroidStudioProjects/ReceiptViewer/app/src/main/res/values/strings.xml