nowa bd
Merge branch 'master' of https://github.com/tMaxx/muzeum

Conflicts:
	new_db.txt