Merge branch 'app' of C:\Users\VINCE-LTPC\AndroidstudioProjects\KiddoCareV1 with conflicts.
Merge remote-tracking branch 'origin/app' into app
Changes -