Merge origin/master
Rozne poprawki
Merge branch 'master' of https://github.com/feliper2k/projekt-pprs

Conflicts:
	src/main/java/com/rybe/projektpprs/ProjektPPRS.java