simplified makefile
zwischenstand
Merge branch 'makefile' into dev
columns after the first two are ignored for input
added another test
Merge branch 'dev'