rename the files
remove the old files
Merge pull request #580 from alphagov/holiday_entitlement_two_into_one

Updating holiday entitlement calculator - version 2 is now version one