confilkts
Merge branch 'master' of https://github.com/sawcioo/PROJEKTAGH.git

Conflicts:
	Technologie
Obiektowe/Projekt/SchoolSystem/src/main/java/pl/edu/agh/to/SchoolSystem/App.java