.gitingore
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	build/classes/elektronika/Autoalarm.class
	build/classes/osprzet/FiltrOleju.class
	build/classes/pojazd/Pojazd.class
	build/classes/test/DrugiTest.class
	nbproject/private/private.xml
	nbproject/project.properties