dondi donds
Merge branch 'master' of https://github.com/dionellorera/TrackingAndOrderingSystem

Conflicts:
	app/src/main/res/layout/fragment_meetings.xml
	app/src/main/res/values/strings.xml