added todo comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	fyp/src/simulation/Simulator.java