conflict test
Merge branch 'master' of https://github.com/andrasszabo88/POO_project

Conflicts:
	POO_project/src/project/DataReader/CountCharReader.java