Added the new params for the market and plugged the equations for the company variables, except variable costs
Added the customer satisfaction values and fixed the algorithm for calculating total network satisfaction
Changed the sales to match the new algorithms
Various changes to support the new params
Parsing a variable file is now possible for markets
Merge branch 'new-market-params'