change gitignore from eclipse to intellij
make contatenation of CONC and CONT lines optional