sim->schedule prob
ok1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chandim-Project/IntersectionwithSignal.h
gitignore change
minor