Added all the testcases and completed the Makefile(with help of Joost)
Delete a last remaining file
commit after the partly failed merge
Made a small change to Makefile
Commit after a merge
Add a Makefile to the master branch, it should be replaced by the Makefile from the change_makefile branch
Another small change to the Makefile, to get a new version of Makefile
commit after a conficting merge, used a git rm of the Makefile
Copied the Makefile from the change_makefile_list_testcases branch, because merging did not work out well