adding holiday rate rule
fixed merged conflicts
Merge pull request #7 from hunterritchie/holiday_rate_rule

Holiday rate rule
updating test to account for change in reservations for base rate vs calculated rate and holidays
adding holiday rate rule
cleanup from merge
cleanup from merge conflicts