Merge branch 'teamlead'
Fixed a problem with waitUntil.
Made lunch length a variable so that subclasses can differ.
Merge branch 'teamlead'

Conflicts:
	src/DummyEmployee.java