View changes
Merge branch 'master' of github.com:ups100/PSZT

Conflicts:
	src/pl/edu/pw/elka/pszt/Statistics.java