Logger added
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Message Dummy
NW: Notificatoins
update
Merge pull request #138 from svdvonde/master

Database branch wordt master branch
SchedulerInitializer.java
Merge commit '00fb871a608a0ee78e8e0ca5e064ef0a2685bbd5' into BackEnd
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	.gitignore
NW: Notifications
W: Notifications
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	.gitignore
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/hello.jsp
W: Profile Controller
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Merge branch 'MyMaster' into Scheduling
Api Calendar
API Calendar Example
vervollediging eerste constraint + koppeling aan  solver.xml
Merge pull request #139 from svdvonde/master

Update database branch naar laatste versie
Merge pull request #140 from CalZoneVUB/Database

Merge pull request #139 from svdvonde/master
Merge branch 'MyMaster' into Scheduling