ignore
Merge branch 'master' of https://github.com/SlavianaKaziuko/autopark

Conflicts:
	.gitignore
	AUTOPARKDB/AUTOPARKDB.dbmdl