added headlines
added gitignore
fixed merge conflict