spec
Merge branch 'master' into rspec
added route for http request
Merge branch 'master' of github.com:Elffers/SlothShip

Conflicts:
	app/controllers/shipper_controller.rb
	config/routes.rb
service_authentication initialize
Merge branch 'security' of github.com:Elffers/SlothShip into security
fixing authenticity
authentication works!!!
refactor
Merge pull request #12 from Elffers/security

Security