edytowanie
Merge remote-tracking branch 'origin/master'

Conflicts:
	Flower/index.php
	Flower/test.db
Merge branch 'master' of https://github.com/AlphaPL/Serwis-Turystyczny

Conflicts:
	Flower/test.db