first commit with IDEA from IntelliJ
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ch/daoinformati/martinsjavatestsnumbertwo/part1/SayNothingToTheWorld.java