Updated discounts, passenger types and tours
Merge branch 'master' of https://github.com/CarterStClair/BirdsUnderwater.git