End time cannot be earlier than start time
Merge remote-tracking branch 'origin/Stanley's_Branch' into Ben's_branch

Conflicts:
	.classpath