git made me to commit ;c
Merge branch 'master' of https://github.com/kirkor93/Programowanie_komponentowe

Conflicts:
	Projekt/build/classes/Model/ModelClass.class
	Projekt/build/classes/Model/serializerXML.class
	Projekt/nbproject/private/private.xml
Merge branch 'master' of https://github.com/kirkor93/Programowanie_komponentowe
made some progress with Data and Controller
Merge branch 'master' of https://github.com/kirkor93/Programowanie_komponentowe

Conflicts:
	Projekt/build/classes/Model/ModelClass.class
	Projekt/build/classes/Model/databaseConnection.class
	Projekt/build/classes/Model/rezerwacja.class
	Projekt/build/classes/Model/serializerXML.class
	Projekt/build/classes/View/AboutWindow$1.class
	Projekt/build/classes/View/AboutWindow.class
	Projekt/build/classes/javaprojekt/JavaProjekt.class
	Projekt/nbproject/private/private.xml