photo from camera and gallery displays @ home
file from phone works /w dropbox/file manager/gallery for me
local file from phone now works pre and post 4.4 (they changed the damn return uri in 4.4)
almost done with query
added comment
fixed return
fixed return
made more robust
searches the database after the result
more error checking
deleted stray else
more error checking
started PurchaseTask
more error checking
Merge remote-tracking branch 'origin/picupload'

Conflicts:
	app/src/main/java/com/example/nicklawler222/shopping/DataHolder.java
	app/src/main/res/layout/activity_splash.xml
	app/src/main/res/values/strings.xml
merged camera into master