Manager finishes answering one question before meeting/lunch
Merge remote-tracking branch 'origin/master'

Conflicts:
	Manager.java
Merge branch 'master' of https://github.com/Locke64/project-day-sim

Conflicts:
	Manager.java