add 4
Merge branch 'master' of https://github.com/marianekint/jrepo.git

Conflicts:
	JProj/src/Main.java
add 6