ignore some files
remove a space from a filename
Merge branch 'tidies' into staging