1
5
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/Prime_nubmers.java
Fixed test method