edit1
edit2
edit3
edit4
edit6

Conflicts:
	3JP/src/c/file1.java
delete code 3JP
edit5

Conflicts:
	3JP/src/c/file1.java
Merge branch 'master' of https://github.com/gjimenem/NJP.git

Conflicts:
	3JP/src/c/file1.java