Added the trip calc to main.rb
More trip calc stuff to main.rb
Testing Ralph's trip calc
Conclude merge