added gitignore
removed obsolete file
Merge remote-tracking branch 'upstream/master'