Merge branch 'alice/master' into 'master'

Caught a nasty bug that would've doubly charged customs fees.

See merge request !1

airfare.js

@@ -5,6 +5,7 @@ var federalTransportTax = .025;
 
 function calculateAirfare(baseFare) {
     var fare = baseFare;                
+    fare += customsFee; // Fixed it! Phew. Glad we didn't ship that! - Alice
     fare += immigrationFee;
     fare *= (1 + federalTransportTax);
     return fare;