fragment
Merge branch 'master' of https://github.com/elf11/ShareNCare

Conflicts:
	app/build/intermediates/incremental/mergeResources/debug/merger.xml
	app/build/intermediates/libs/app-debug.ap_
	app/build/intermediates/res/debug/values/values.xml
	build/intermediates/model_data.bin