add char 6 at end
reset
Merge branch 'master' of https://github.com/marianekint/jrepo.git

Conflicts:
	JProj/src/Main.java