added gitignore, maybe too late
Merge remote-tracking branch 'origin/master'