added a testfile as collaborator in branch
Merged Mario's work