Ignore some stuff
Remove accidentally committed temp files
Merge.