Add some edited files to be able to pull master updates, not done yet