trying conflict again
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/graphGenerators/Time.java