Ignoring a few more files.
Merge branch 'master' into compete_othulio