Merged
Fixed .gitignore
getArtworkFromDatabase updated, dynamisch paginanummers toevoegen
merge
Merged
dit
Merge branch 'master' of https://github.com/utwente-di/di10
Merge branch 'master' of github.com:utwente-di/di10
browse fix, singleton terug
Hiero
Merge branch 'artwork' of https://github.com/utwente-di/di10.git into artwork
Added uploading of images, some minor fixes
Merge branch 'master' of https://github.com/utwente-di/di10
fix  kunstwerk, huren van artworks geïmplementeerd
Merge branch 'master' of github.com:utwente-di/di10
Merge branch 'master' into detailpage
Merge branch 'artwork' of https://github.com/utwente-di/di10.git into artwork
db schema
Fixed adding of images
Merge branch 'master' of https://github.com/utwente-di/di10