My changes.
Merge remote-tracking branch 'origin/master'
Ignoring some files.
Removing some ignored files.