Added workspace
Update .gitignore
Merge branch 'peter' of https://github.com/utwente-di/di03 into peter
remove temp files from tracking
modified gitignore