fedex renders json
Merge branch 'master' of github.com:Elffers/SlothShip into fedex

Conflicts:
	app/controllers/ups_controller.rb
	config/routes.rb
merged changes
abstracts methods to application controller
Merge branch 'master' of github.com:Elffers/SlothShip into fedex

Conflicts:
	app/controllers/ups_controller.rb
	config/routes.rb
abstracts to application controller, fedex view works
Merge pull request #5 from Elffers/fedex

Fedex