Merge remote-tracking branch 'origin/Test-SJ' into Test-SJ
# Conflicts: # pp.A1-CondPhilosophers/src/main/java/pp/Philosopher.javaTest-SJ
commit
bcb6d6f045
# Conflicts: # pp.A1-CondPhilosophers/src/main/java/pp/Philosopher.javaTest-SJ