shot at line number in error messages
resolved conflict
eol: system line separator
improved dateline
*.txt ignored