New problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	SampleCodes/src/sampleCodes/MaxWorkingHours.java