Updating template branch with more master files