commit test7
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gittest01/LatinSquaresMain01.java