removed printlines
Merge branch 'jeroen' of github.com:Kurocon/IntegrationProject into jeroen
Merge branch 'kevin' into jeroen
Merge branch 'kevin' into jeroen
Merge conflicts that are not merge conflicts
added status log at file transfer