Merge branch 'devel' into VH12I-A1
Databaseimplemenation af

De functie getAllTimeLineItems is nu af
Project file

Moest blijkbaar nog mee gecommit worden
Merge branch 'devel' into VH12I-A1

Conflicts:
	EPD/EPD/src/Entity/DataBaseimplementation.java
Merge branch 'VH12I-A1' of https://github.com/thopstaken/VH12IA into VH12I-A1
Merge branch 'devel' into VH12I-A1
Task gebruikt nu webservices?
Merge branch 'VH12I-A1' into devel
Merge branch 'VH12I-A2' into devel
Merge branch 'VH12I-A3' into devel
Merge branch 'devel' into VH12I-A3