things with photos
Merge branch 'master' of https://github.com/elf11/ShareNCare

Conflicts:
	app/src/main/java/com/example/demouser/sharencare/MainActivity.java