new class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/oop/ex7/Reader/FileReader.java
new class