adding ignore file again
re-applying other edits
Merge remote-tracking branch 'upstream/master'