Added more files to ignore
Merge branch 'master' into 24