more artwork stuff
merge conflicts resolved
Merge branch 'search' of github.com:utwente-di/di10 into search