Konstr
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lek/src/E/File.java