Add Trains#power_source method.
Merge remote-tracking branch 'origin/master' into calculate-trip-time

Conflicts:
	train.rb
Add trains.rb to resolve conflict.