fehlgeschlagener Chartversuch & Timing für Studenten
projektsynchronisation
Merge branch 'master' of https://github.com/jvogtherr/OScillate

Conflicts:
	OScillate.rs/repast.simphony.action.data_set_1.xml
	OScillate.rs/scenario.xml
	src/OScillate/Student.java
	velocity.log