Room CSV
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
ingeschreven vakken pagina afgemaakt, dummy data toegevoegd
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
RoomCSV Reader working
Merge pull request #54 from fsuarezg/master

Pagina's toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/src/main/java/com/vub/datadump/ReadCSV.java
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/src/main/java/com/vub/model/ReadCSV.java
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
Conflict Resolution
Room Fix
Merge commit '72c1363fbdcada63adbd12f9ed726d73887e3f12'