poprawki
poprawki
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/csv/m_enc