Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneMaster' into MyMaster
i need to pull
Merge branch 'CalZoneVUB/Scheduler'
Merge branch 'CalZoneVUB/master'
2e dataset voor benchmarker in de maak + fix foute merge in Entry
update
Merge branch 'CalZoneMaster' into MyMaster

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/src/main/java/com/vub/service/TrajectService.java
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrolledCourses.jsp
Merge branch 'MyMaster' into Scheduling
auto merge resolving
generated second dataset
verplaatst naar testcode, want relevantere locatie
Merge branch 'CalZoneMaster' into Scheduling
Merge branch 'CalZoneScheduling' into Scheduling

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
	JavaServer/calzone/src/main/java/com/vub/service/TrajectService.java
	JavaServer/calzone/src/main/test/com/vub/scheduler/SchedulerBenchmarker.java
merge made this vanish...
Merge branch 'CalZoneVUB/Scheduler'
no idea why this isn't updated...
start nieuwe testfile voor rules te checken
Merge pull request #225 from yocoppen/Scheduling

Scheduling