regular update
Merge branch 'master' of git@github.com:evelinad/TemeIDP.git

Conflicts:
	src/GUI/GUI_Main.java