workspace
Merge branch 'master' of https://github.com/irynaLv/FlowersDB

Conflicts:
	backend/.idea/workspace.xml
	frontend/.idea/workspace.xml