modified camera activity to return values with intent
Merge branch 'master' of https://github.com/yuanzhi-umd/receipt_master
merge
Conflicts:
	AndroidStudioProjects/ReceiptViewer/app/src/main/java/com/bootcamp/receipt/receiptviewer/MainActivity.java