Added factory-girl, updated both controllers, updated a fare and a commission calculator to use general formulas, updated general formulas, generated Rspec folder, created Booking Factory