menuu
taranta
taranta
Merge branch 'master' of https://github.com/dionellorera/TheTryAgainFireflyProject

Conflicts:
	app/src/main/java/firefly/project/ActivityCustomerList.java
	app/src/main/java/firefly/project/ActivityMeetingNotes.java
	app/src/main/java/firefly/project/ActivityMeetingsList.java