Toevoegen aan Eclipse
Merge remote-tracking branch 'origin/Sprint-1' into 1-Informatie_Ophalen
update db class
Assignments Forum
merge
merge conflict
db update
DB aanpassingen
convert to mysqli

insert - update - delete moet nog aangepast worden
merge from database-layer
psuh!
Merge branch 'Sprint-1' of https://github.com/terryvdgriend/Interactive-Website into Sprint-1
Kleine Update
Merge remote-tracking branch 'origin/Sprint-1' into 1-Informatie_Ophalen
Phaze 1, DONE bitchez!

special thanks to terri en andy
Merge 'Mapfuncties' en 'Sprint-1'