Track-Presets
Merge branch 'master' of
https://github.com/uzapy/ch.bfh.bti7301.w2014.Verkehrssimulation

Conflicts:
	Verkehrssimulation/src/model/Nagel_Schreckenberg_Simulation.java